Mercurial > octave

changeset 2126:d5f574877f59

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 1996-05-12 10:31:32 by jwe]
author jwe
date Sun, 12 May 1996 10:33:54 +0000
parents 5049a300eee0
children 6c8706cd60fb
files aclocal.m4 liboctave/sun-utils.cc
diffstat 2 files changed, 13 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/aclocal.m4	Sun May 12 08:40:01 1996 +0000
+++ b/aclocal.m4	Sun May 12 10:33:54 1996 +0000
@@ -323,8 +323,10 @@
   return (! forsub (s, &d, len));
 #endif
 }
-#if defind (sun) || defined (linux)
+#if defind (sun)
 int MAIN_ () { return 0; }
+#elif defined (linux) && defined (__ELF__)
+int MAIN__ () { return 0; }
 #endif
 EOF
 changequote([, ])
--- a/liboctave/sun-utils.cc	Sun May 12 08:40:01 1996 +0000
+++ b/liboctave/sun-utils.cc	Sun May 12 10:33:54 1996 +0000
@@ -20,25 +20,29 @@
 
 */
 
-#if defined (sun) || defined (linux)
-
 #include <cassert>
 
 // I think that this is really only needed if linking to Fortran
-// compiled libraries on a Sun.  It also seems to be needed on Linux
-// systems with g77.  It should never be called.
+// compiled libraries on a Sun.  It also seems to be needed on
+// Linux/ELF systems with g77.  It should never be called.
 
 extern "C"
 {
+#if defined (sun)
   int MAIN_ (void)
     {
       assert (0);
       return 0;
     }
+#elif defined (linux) && defined (__ELF__)
+  int MAIN__ (void)
+    {
+      assert (0);
+      return 0;
+    }
+#endif
 }
 
-#endif
-
 /*
 ;;; Local Variables: ***
 ;;; mode: C++ ***