diff options
| author | LRN <LRN@140774ce-b5e7-0310-ab8b-a85725594a96> | 2012-12-05 22:34:47 +0000 |
|---|---|---|
| committer | LRN <LRN@140774ce-b5e7-0310-ab8b-a85725594a96> | 2012-12-05 22:34:47 +0000 |
| commit | 40d234e8424fe6d0f9ae3f1d4e09469fe1f7bbcf (patch) | |
| tree | 236e0058a26414a13f7e192be9aca14846d40a14 | |
| parent | ea836c70311dec69341d51b60f59266088b34dd1 (diff) | |
Should be compilable without libglpk again
git-svn-id: https://gnunet.org/svn/gnunet@25278 140774ce-b5e7-0310-ab8b-a85725594a96
| -rw-r--r-- | src/ats/gnunet-service-ats_addresses.c | 2 | ||||
| -rw-r--r-- | src/ats/gnunet-service-ats_addresses_mlp.h | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/ats/gnunet-service-ats_addresses.c b/src/ats/gnunet-service-ats_addresses.c index 83c87c9084..b42fadb9be 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 083d2e6593..f0af97dd6b 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 |