From: LRN <lrn1986@gmail.com>
Date: Wed, 5 Dec 2012 22:34:47 +0000 (+0000)
Subject: Should be compilable without libglpk again
X-Git-Tag: initial-import-from-subversion-38251~10599
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=73145e02f6a38e04852e4d32bace47b956a4ad1d;p=oweals%2Fgnunet.git

Should be compilable without libglpk again
---

diff --git a/src/ats/gnunet-service-ats_addresses.c b/src/ats/gnunet-service-ats_addresses.c
index 83c87c908..b42fadb9b 100644
--- a/src/ats/gnunet-service-ats_addresses.c
+++ b/src/ats/gnunet-service-ats_addresses.c
@@ -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"
 
 
diff --git a/src/ats/gnunet-service-ats_addresses_mlp.h b/src/ats/gnunet-service-ats_addresses_mlp.h
index 083d2e659..f0af97dd6 100644
--- a/src/ats/gnunet-service-ats_addresses_mlp.h
+++ b/src/ats/gnunet-service-ats_addresses_mlp.h
@@ -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