Mercurial > octave-nkf

changeset 6472:fb53fc94f526

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2007-03-29 12:49:51 by jwe]
author jwe
date Thu, 29 Mar 2007 12:49:52 +0000
parents 23e8f1cf79ab
children 5abfdf1aa2ce
files src/ChangeLog src/DLD-FUNCTIONS/__glpk__.cc
diffstat 2 files changed, 5 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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+
--- 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