# HG changeset patch
# User Alpar Juttner <alpar@cs.elte.hu>
# Date 1241695260 -3600
# Node ID 682941948726dc7a2dbb9dce183ba66c9bde940f
# Parent  e2f99a47399864505dab1ea721acb866c5c006e2# Parent  a8dfe89b7719977214e95394a54fd1e2c588baf4
Merge

diff -r e2f99a473998 -r 682941948726 lemon/glpk.h
--- a/lemon/glpk.h	Thu May 07 12:19:41 2009 +0100
+++ b/lemon/glpk.h	Thu May 07 12:21:00 2009 +0100
@@ -26,9 +26,10 @@
 #include <lemon/lp_base.h>
 
 // forward declaration
-#ifndef _GLP_PROB
+#if !defined _GLP_PROB && !defined GLP_PROB
 #define _GLP_PROB
-typedef struct { double _prob; } glp_prob;
+#define GLP_PROB
+typedef struct { double _opaque_prob; } glp_prob;
 /* LP/MIP problem object */
 #endif