[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r25278 - gnunet/src/ats
From: |
gnunet |
Subject: |
[GNUnet-SVN] r25278 - gnunet/src/ats |
Date: |
Wed, 5 Dec 2012 23:34:47 +0100 |
Author: LRN
Date: 2012-12-05 23:34:47 +0100 (Wed, 05 Dec 2012)
New Revision: 25278
Modified:
gnunet/src/ats/gnunet-service-ats_addresses.c
gnunet/src/ats/gnunet-service-ats_addresses_mlp.h
Log:
Should be compilable without libglpk again
Modified: gnunet/src/ats/gnunet-service-ats_addresses.c
===================================================================
--- gnunet/src/ats/gnunet-service-ats_addresses.c 2012-12-05 21:42:41 UTC
(rev 25277)
+++ gnunet/src/ats/gnunet-service-ats_addresses.c 2012-12-05 22:34:47 UTC
(rev 25278)
@@ -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"
Modified: gnunet/src/ats/gnunet-service-ats_addresses_mlp.h
===================================================================
--- gnunet/src/ats/gnunet-service-ats_addresses_mlp.h 2012-12-05 21:42:41 UTC
(rev 25277)
+++ gnunet/src/ats/gnunet-service-ats_addresses_mlp.h 2012-12-05 22:34:47 UTC
(rev 25278)
@@ -96,12 +96,20 @@
/**
* 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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r25278 - gnunet/src/ats,
gnunet <=