--- octave-2.9.10/src/DLD-FUNCTIONS/__glpk__.cc	2007-03-05 19:41:57.000000000 +0100
+++ octave-2.9.10/src/DLD-FUNCTIONS/__glpk__.cc	2007-04-04 05:22:17.000000000 +0200
@@ -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
@@ -260,7 +257,8 @@
 
   if (save_pb)
     {
-      if (lpx_write_cpxlp (lp, "outpb.lp") != 0)
+      static char tmp[] = "outpb.lp";
+      if (lpx_write_cpxlp (lp, tmp) != 0)
 	{
 	  error ("__glpk__: unable to write problem");
 	  longjmp (mark, -1);
@@ -311,7 +309,8 @@
 #ifdef GLPK_PRE_4_14
       insist (method != method);
 #else
-      glpk_fault_hook (0, "method != method");
+      static char tmp[] = "method != method";
+      glpk_fault_hook (0, tmp);
 #endif
     }