Eric Sunshine patch - Mods to work on NextStep

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk/SWIG@5674 626c5289-ae23-0410-ae9c-e8d60b6d4f22

Source/DOH/string.c

@@ -1030,7 +1030,9 @@ int DohStrncmp(const DOHString_or_char *s1, const DOHString_or_char *s2, int n)
 }
 
 char *DohStrstr(const DOHString_or_char *s1, const DOHString_or_char *s2) {
-  return strstr(Char(s1),Char(s2));
+  char* p1 = Char(s1);
+  char* p2 = Char(s2);
+  return p2 == 0 || *p2 == '\0' ? p1 : strstr(p1,p2);
 }
 
 char *DohStrchr(const DOHString_or_char *s1, int ch) {

Source/Modules/browser.cxx

@@ -12,9 +12,6 @@
 
 char cvsroot_browser_cxx[] = "$Header$";
 
-#ifndef MACSWIG
-#include "swigconfig.h"
-#endif
 #include "swigmod.h"
 
 #ifdef SWIG_SWILL

Source/Modules/chicken.cxx

@@ -23,10 +23,6 @@ char cvsroot_chicken_cxx[] = "$Header$";
 
 #include "swigmod.h"
 
-#ifndef MACSWIG
-#include "swigconfig.h"
-#endif
-
 #include <ctype.h>
 
 static const char *chicken_usage = (char*)"\
@@ -134,10 +130,12 @@ protected:
  * swig_chicken()    - Instantiate module
  * ----------------------------------------------------------------------- */
 
-extern "C" Language *
+static Language * new_swig_chicken() {
-swig_chicken(void) {
   return new CHICKEN();
 }
+extern "C" Language * swig_chicken(void) {
+  return new_swig_chicken();
+}
 
 void 
 CHICKEN::main(int argc, char *argv[])

Source/Modules/csharp.cxx

@@ -14,9 +14,6 @@ char cvsroot_csharp_cxx[] = "$Header$";
 
 #include <limits.h> // for INT_MAX
 #include "swigmod.h"
-#ifndef MACSWIG
-#include "swigconfig.h"
-#endif
 #include <ctype.h>
 
 class CSHARP : public Language {
@@ -2021,10 +2018,12 @@ class CSHARP : public Language {
  * swig_csharp()    - Instantiate module
  * ----------------------------------------------------------------------------- */
 
-extern "C" Language *
+static Language * new_swig_csharp() {
-swig_csharp(void) {
   return new CSHARP();
 }
+extern "C" Language * swig_csharp(void) {
+  return new_swig_csharp();
+}
 
 /* -----------------------------------------------------------------------------
  * Static member variables

Source/Modules/guile.cxx

@@ -30,9 +30,6 @@ char cvsroot_guile_cxx[] = "$Header$";
 
 #include "swigmod.h"
 
-#ifndef MACSWIG
-#include "swigconfig.h"
-#endif
 #include <ctype.h>
 
 // Note string broken in half for compilers that can't handle long strings
@@ -1766,7 +1763,9 @@ public:
  * swig_guile()    - Instantiate module
  * ----------------------------------------------------------------------------- */
 
-extern "C" Language *
+static Language * new_swig_guile() {
-swig_guile(void) {
   return new GUILE();
 }
+extern "C" Language * swig_guile(void) {
+  return new_swig_guile();
+}

Source/Modules/java.cxx

@@ -14,9 +14,6 @@ char cvsroot_java_cxx[] = "$Header$";
 
 #include <limits.h> // for INT_MAX
 #include "swigmod.h"
-#ifndef MACSWIG
-#include "swigconfig.h"
-#endif
 #include <ctype.h>
 
 /* Hash type used for JNI upcall data */
@@ -3281,10 +3278,12 @@ class JAVA : public Language {
  * swig_java()    - Instantiate module
  * ----------------------------------------------------------------------------- */
 
-extern "C" Language *
+static Language * new_swig_java() {
-swig_java(void) {
   return new JAVA();
 }
+extern "C" Language * swig_java(void) {
+  return new_swig_java();
+}
 
 /* -----------------------------------------------------------------------------
  * Static member variables

Source/Modules/main.cxx

@@ -20,9 +20,6 @@ char cvsroot_main_cxx[] = "$Header$";
 #endif
 
 #include "swigmod.h"
-#ifndef MACSWIG
-#include "swigconfig.h"
-#endif
 
 #include "swigwarn.h"
 #include "cparse.h"

Source/Modules/mzscheme.cxx

@@ -25,10 +25,6 @@ char cvsroot_mzscheme_cxx[] = "$Header$";
 
 #include "swigmod.h"
 
-#ifndef MACSWIG
-#include "swigconfig.h"
-#endif
-
 #include <ctype.h>
 
 static const char *usage = (char*)"\
@@ -690,9 +686,11 @@ public:
  * swig_mzscheme()    - Instantiate module
  * ----------------------------------------------------------------------------- */
 
-extern "C" Language *
+static Language * new_swig_mzscheme() {
-swig_mzscheme(void) {
   return new MZSCHEME();
 }
+extern "C" Language * swig_mzscheme(void) {
+  return new_swig_mzscheme();
+}
 
 

Source/Modules/ocaml.cxx

@@ -20,10 +20,6 @@ char cvsroot_ocaml_cxx[] = "$Header$";
 
 #include "swigmod.h"
 
-#ifndef MACSWIG
-#include "swigconfig.h"
-#endif
-
 #include <ctype.h>
 
 static const char *usage = (char*)
@@ -1898,8 +1894,10 @@ public:
  * swig_ocaml()    - Instantiate module
  * ------------------------------------------------------------------------- */
 
-extern "C" Language *
+static Language * new_swig_ocaml() {
-swig_ocaml(void) {
     return new OCAML();
 }
+extern "C" Language * swig_ocaml(void) {
+    return new_swig_ocaml();
+}
 

Source/Modules/perl5.cxx

@@ -17,10 +17,6 @@ char cvsroot_perl5_cxx[] = "$Header$";
 
 #include "swigmod.h"
 
-#ifndef MACSWIG
-#include "swigconfig.h"
-#endif
-
 static const char *usage = (char*)"\
 Perl5 Options (available with -perl5)\n\
      -ldflags        - Print runtime libraries to link with\n\
@@ -1436,7 +1432,9 @@ public:
  * swig_perl5()    - Instantiate module
  * ----------------------------------------------------------------------------- */
 
-extern "C" Language *
+static Language * new_swig_perl5() {
-swig_perl5(void) {
   return new PERL5();
 }
+extern "C" Language * swig_perl5(void) {
+  return new_swig_perl5();
+}

Source/Modules/php4.cxx

@@ -17,10 +17,6 @@ char cvsroot_php4_cxx[] = "$Header$";
 
 #include "swigmod.h"
 
-#ifndef MACSWIG
-#include "swigconfig.h"
-#endif
-
 #include <ctype.h>
 
 
@@ -894,7 +890,7 @@ public:
 */
 
   void create_command(char *cname, char *iname) {
-//    char *lower_cname = strdup(cname);
+//    char *lower_cname = Swig_copy_string(cname);
 //    char *c;
     
 //    for(c = lower_cname; *c != '\0'; c++) {
@@ -2115,8 +2111,7 @@ void typetrace(SwigType *ty, String *mangled, String *clientdata) {
   if (r_prevtracefunc) (*r_prevtracefunc)(ty, mangled, (String *) clientdata);
 }
 
-extern "C" Language *
+static Language * new_swig_php() {
-swig_php(void) {
   maininstance=new PHP4();
   if (! r_prevtracefunc) {
     r_prevtracefunc=SwigType_remember_trace(typetrace);
@@ -2126,4 +2121,6 @@ swig_php(void) {
   }
   return maininstance;
 }
-
+extern "C" Language * swig_php(void) {
+  return new_swig_php();
+}

Source/Modules/pike.cxx

@@ -21,9 +21,6 @@
 char cvsroot_pike_cxx[] = "$Header$";
 
 #include "swigmod.h"
-#ifndef MACSWIG
-#include "swigconfig.h"
-#endif
 
 #include <ctype.h> // for isalnum()
 
@@ -880,7 +877,9 @@ public:
  * swig_pike()    - Instantiate module
  * ----------------------------------------------------------------------------- */
 
-extern "C" Language *
+static Language * new_swig_pike() {
-swig_pike(void) {
   return new PIKE();
 }
+extern "C" Language * swig_pike(void) {
+  return new_swig_pike();
+}

Source/Modules/python.cxx

@@ -13,10 +13,6 @@ char cvsroot_python_cxx[] = "$Header$";
 
 #include "swigmod.h"
 
-#ifndef MACSWIG
-#include "swigconfig.h"
-#endif
-
 #include <ctype.h>
 
 #define PYSHADOW_MEMBER  0x2
@@ -2187,7 +2183,9 @@ public:
  * swig_python()    - Instantiate module
  * ----------------------------------------------------------------------------- */
 
-extern "C" Language *
+static Language * new_swig_python() {
-swig_python(void) {
   return new PYTHON();
 }
+extern "C" Language * swig_python(void) {
+  return new_swig_python();
+}

Source/Modules/ruby.cxx

@@ -15,10 +15,6 @@ char cvsroot_ruby_cxx[] = "$Header$";
 #include "swigmod.h"
 #define SWIG_PROTECTED_TARGET_METHODS 1
 
-#ifndef MACSWIG
-#include "swigconfig.h"
-#endif
-
 #include <ctype.h>
 #include <string.h>
 #include <limits.h> /* for INT_MAX */
@@ -2357,10 +2353,12 @@ public:
  * swig_ruby()    - Instantiate module
  * ----------------------------------------------------------------------------- */
 
-extern "C" Language *
+static Language * new_swig_ruby() {
-swig_ruby(void) {
   return new RUBY();
 }
+extern "C" Language * swig_ruby(void) {
+  return new_swig_ruby();
+}
 
 
 /*

Source/Modules/s-exp.cxx

@@ -406,7 +406,9 @@ public:
 };
 
 
-extern "C" Language *
+static Language * new_swig_sexp() {
-swig_sexp( void ) {
   return new Sexp();
 }
+extern "C" Language * swig_sexp( void ) {
+  return new_swig_sexp();
+}

Source/Modules/swigmain.cxx

@@ -22,10 +22,6 @@
 
 char cvsroot_swigmain_cxx[] = "$Header$";
 
-#ifndef MACSWIG
-#include "swigconfig.h"
-#endif
-
 #include "swigmod.h"
 
 /* Module factories.  These functions are used to instantiate 

Source/Modules/tcl8.cxx

@@ -24,10 +24,6 @@ char cvsroot_tcl8_cxx[] = "$Header$";
 
 #include "swigmod.h"
 
-#ifndef MACSWIG
-#include "swigconfig.h"
-#endif
-
 static const char *usage = (char*)"\
 Tcl 8 Options (available with -tcl)\n\
      -itcl           - Enable ITcl support\n\
@@ -1220,10 +1216,12 @@ public:
  * swig_tcl()    - Instantiate module
  * ---------------------------------------------------------------------- */
 
-extern "C" Language *
+static Language * new_swig_tcl() {
-swig_tcl(void) {
   return new TCL8();
 }
+extern "C" Language * swig_tcl(void) {
+  return new_swig_tcl();
+}
 
 
 

Source/Modules/xml.cxx

@@ -332,7 +332,9 @@ public:
 };
 
 
-extern "C" Language *
+static Language * new_swig_xml() {
-swig_xml( void ) {
         return new XML();
 }
+extern "C" Language * swig_xml( void ) {
+        return new_swig_xml();
+}

Source/Swig/misc.c

@@ -12,9 +12,6 @@
 char cvsroot_misc_c[] = "$Header$";
 
 #include "swig.h"
-#ifndef MACSWIG
-#include "swigconfig.h"
-#endif
 #include <ctype.h>
 
 /* -----------------------------------------------------------------------------

Source/Swig/swig.h

@@ -24,6 +24,16 @@
 extern "C" {
 #endif
 
+#ifndef MACSWIG
+#include "swigconfig.h"
+#endif
+
+#if defined(__cplusplus) && !defined(HAVE_BOOL)
+typedef int bool;
+#define true ((bool)1)
+#define false ((bool)0)
+#endif
+
 #include "doh.h"
 
 /* Status codes */