Should be compilable without libglpk again
authorLRN <lrn1986@gmail.com>
Wed, 5 Dec 2012 22:34:47 +0000 (22:34 +0000)
committerLRN <lrn1986@gmail.com>
Wed, 5 Dec 2012 22:34:47 +0000 (22:34 +0000)
src/ats/gnunet-service-ats_addresses.c
src/ats/gnunet-service-ats_addresses_mlp.h

index 83c87c90847cbcb0e421b0a57ae79e7dcd6c0578..b42fadb9bef53084b111650df1b225a3069f2014 100644 (file)
@@ -31,9 +31,7 @@
 #include "gnunet-service-ats_performance.h"
 #include "gnunet-service-ats_scheduling.h"
 #include "gnunet-service-ats_reservations.h"
-#if HAVE_LIBGLPK
 #include "gnunet-service-ats_addresses_mlp.h"
-#endif
 #include "gnunet-service-ats_addresses_simplistic.h"
 
 
index 083d2e6593926d880ff7039aff8bf9d641af7562..f0af97dd6b17ec47572b9a78f6dd8a4a3876b4cb 100644 (file)
@@ -96,12 +96,20 @@ struct GAS_MLP_Handle
   /**
    * GLPK LP control parameter
    */
+#if HAVE_LIBGLPK
   glp_smcp control_param_lp;
+#else
+  void *control_param_lp;
+#endif
 
   /**
    * GLPK LP control parameter
    */
+#if HAVE_LIBGLPK
   glp_iocp control_param_mlp;
+#else
+  void *control_param_mlp;
+#endif
 
   /**
    * Solves the task in an regular interval