Merge
authorAlpar Juttner <alpar@cs.elte.hu>
Thu, 07 May 2009 12:21:00 +0100
changeset 651682941948726
parent 650 e2f99a473998
parent 648 a8dfe89b7719
child 652 a312f84d86c6
Merge
     1.1 --- a/lemon/glpk.h	Thu May 07 12:19:41 2009 +0100
     1.2 +++ b/lemon/glpk.h	Thu May 07 12:21:00 2009 +0100
     1.3 @@ -26,9 +26,10 @@
     1.4  #include <lemon/lp_base.h>
     1.5  
     1.6  // forward declaration
     1.7 -#ifndef _GLP_PROB
     1.8 +#if !defined _GLP_PROB && !defined GLP_PROB
     1.9  #define _GLP_PROB
    1.10 -typedef struct { double _prob; } glp_prob;
    1.11 +#define GLP_PROB
    1.12 +typedef struct { double _opaque_prob; } glp_prob;
    1.13  /* LP/MIP problem object */
    1.14  #endif
    1.15