# HG changeset patch
# User jwe
# Date 1175172592 0
# Node ID fb53fc94f5266f7c0154ac729c3c4d91334595b1
# Parent  23e8f1cf79ab252a7b824e7bcf775d97f10386b7
[project @ 2007-03-29 12:49:51 by jwe]

diff -r 23e8f1cf79ab -r fb53fc94f526 src/ChangeLog
--- a/src/ChangeLog	Tue Mar 27 20:38:11 2007 +0000
+++ b/src/ChangeLog	Thu Mar 29 12:49:52 2007 +0000
@@ -1,3 +1,7 @@
+2007-03-28  Rafael Laboissiere  <rafael@debian.org>
+
+	* DLD-FUNCTIONS/__glpk__.cc: Fix #ifdef logic around GLPK_PRE_4_14.
+
 2007-03-27  John W. Eaton  <jwe@octave.org>
 
 	* version.h (OCTAVE_VERSION): Now 2.9.10+
diff -r 23e8f1cf79ab -r fb53fc94f526 src/DLD-FUNCTIONS/__glpk__.cc
--- a/src/DLD-FUNCTIONS/__glpk__.cc	Tue Mar 27 20:38:11 2007 +0000
+++ b/src/DLD-FUNCTIONS/__glpk__.cc	Thu Mar 29 12:49:52 2007 +0000
@@ -53,17 +53,14 @@
 #ifndef lib_set_print_hook
 #define lib_set_print_hook lib_print_hook
 #endif
-}
 
 #else
 
-extern "C"
-{
 void _glp_lib_print_hook (int (*func)(void *info, char *buf), void *info);
 void _glp_lib_fault_hook (int (*func)(void *info, char *buf), void *info);
-}
 
 #endif
+}
 
 #define NIntP 17
 #define NRealP 10