Make osqp build
Prep for using it in the catapult.
Change-Id: Ic642b1c04469563de13a8a6227407aacb75eff6a
Signed-off-by: Austin Schuh <austin.linux@gmail.com>
diff --git a/third_party/osqp/src/error.c b/third_party/osqp/src/error.c
index e0c069e..767bb17 100644
--- a/third_party/osqp/src/error.c
+++ b/third_party/osqp/src/error.c
@@ -1,4 +1,4 @@
-#include "error.h"
+#include "osqp_error.h"
const char *OSQP_ERROR_MESSAGE[] = {
"Problem data validation.",
@@ -15,6 +15,8 @@
const char * function_name) {
# ifdef PRINTING
c_print("ERROR in %s: %s\n", function_name, OSQP_ERROR_MESSAGE[error_code-1]);
+# else
+ (void)function_name;
# endif
return (c_int)error_code;
}
diff --git a/third_party/osqp/src/osqp.c b/third_party/osqp/src/osqp.c
index 20cb1af..94819b3 100644
--- a/third_party/osqp/src/osqp.c
+++ b/third_party/osqp/src/osqp.c
@@ -3,7 +3,7 @@
#include "util.h"
#include "scaling.h"
#include "glob_opts.h"
-#include "error.h"
+#include "osqp_error.h"
#ifndef EMBEDDED
diff --git a/third_party/osqp/src/polish.c b/third_party/osqp/src/polish.c
index 55df72d..1d23788 100644
--- a/third_party/osqp/src/polish.c
+++ b/third_party/osqp/src/polish.c
@@ -5,7 +5,7 @@
#include "lin_sys.h"
#include "kkt.h"
#include "proj.h"
-#include "error.h"
+#include "osqp_error.h"
/**
* Form reduced matrix A that contains only rows that are active at the