List:NDB Connectors« Previous MessageNext Message »
From:Monty Taylor Date:November 10 2007 12:50am
Subject:Rev 243: Updated from upstream swig. in http://bazaar.launchpad.net/~ndb-connectors/ndb-connectors/ndbjmerge
View as plain text  
At http://bazaar.launchpad.net/~ndb-connectors/ndb-connectors/ndbjmerge

------------------------------------------------------------
revno: 243
revision-id: mtaylor@stripped
parent: mtaylor@stripped
committer: Monty Taylor <mtaylor@stripped>
branch nick: ndbjmerge
timestamp: Fri 2007-11-09 16:49:48 -0800
message:
  Updated from upstream swig.
modified:
  swig/SWIG/CHANGES.current      changes.current-20071104211339-fod7yzi8t7xd3g0w-9
  swig/SWIG/Examples/Makefile.in makefile.in-20071104212232-3zk3l5o1ewcq4w02-1
  swig/SWIG/Examples/r/class/runme.R runme.r-20071104211339-fod7yzi8t7xd3g0w-1964
  swig/SWIG/Examples/r/simple/runme.R runme.r-20071104211339-fod7yzi8t7xd3g0w-1967
  swig/SWIG/Examples/test-suite/r/copy_struct_runme.R
copy_struct_runme.r-20071104211339-fod7yzi8t7xd3g0w-2620
  swig/SWIG/Examples/test-suite/r/double_delete_runme.R
double_delete_runme.-20071104211339-fod7yzi8t7xd3g0w-2622
  swig/SWIG/Examples/test-suite/r/funcptr_runme.R
funcptr_runme.r-20071104211339-fod7yzi8t7xd3g0w-2624
  swig/SWIG/Examples/test-suite/r/ignore_parameter_runme.R
ignore_parameter_run-20071104211339-fod7yzi8t7xd3g0w-2625
  swig/SWIG/Examples/test-suite/r/legacy_runme.R
legacy_runme.r-20071104211339-fod7yzi8t7xd3g0w-2627
  swig/SWIG/Examples/test-suite/r/simple_array_runme.R
simple_array_runme.r-20071104211339-fod7yzi8t7xd3g0w-2629
  swig/SWIG/Examples/test-suite/r/unions_runme.R
unions_runme.r-20071104211339-fod7yzi8t7xd3g0w-2630
  swig/SWIG/Lib/perl5/perlrun.swg perlrun.swg-20071104211339-fod7yzi8t7xd3g0w-1006
  swig/SWIG/Source/Modules/main.cxx main.cxx-20071104211339-fod7yzi8t7xd3g0w-1278
  swig/SWIG/Source/Modules/r.cxx r.cxx-20071104211339-fod7yzi8t7xd3g0w-1288
  swig/SWIG/Tools/mkwindows.sh   mkwindows.sh-20071104211339-fod7yzi8t7xd3g0w-119
  swig/SWIG/configure.in         configure.in-20071104211339-fod7yzi8t7xd3g0w-24
  swig/update_from_swigsvn.sh    update_from_swigsvn.-20071104211339-fod7yzi8t7xd3g0w-5
=== modified file 'swig/SWIG/CHANGES.current'
--- a/swig/SWIG/CHANGES.current	2007-11-04 21:32:20 +0000
+++ b/swig/SWIG/CHANGES.current	2007-11-10 00:49:48 +0000
@@ -1,6 +1,13 @@
 Version 1.3.32 (in progress)
 ============================
 
+11/09/2007: olly
+	    Fix --help output to note that `export SWIG_FEATURES' is required.
+
+10/29/2007: wsfulton
+            [R] Fix seg fault on Windows
+            [R] Examples R scripts are now platform independent
+
 10/30/2007: mgossage
 	    [lua] fixed bug in template classes which cases template_default2 
 	    and template_specialization_defarg to fail.

=== modified file 'swig/SWIG/Examples/Makefile.in'
--- a/swig/SWIG/Examples/Makefile.in	2007-11-04 21:32:20 +0000
+++ b/swig/SWIG/Examples/Makefile.in	2007-11-10 00:49:48 +0000
@@ -1045,5 +1045,5 @@
 r_clean:
 	rm -f *_wrap* *~ .~* $(RSRCS) $(RCXXSRCS)
 	rm -f core @EXTRA_CLEAN@
-	rm -f *.@OBJEXT@ *@SO@
+	rm -f *.@OBJEXT@ *@SO@ NAMESPACE
 

=== modified file 'swig/SWIG/Examples/r/class/runme.R'
--- a/swig/SWIG/Examples/r/class/runme.R	2007-11-04 21:32:20 +0000
+++ b/swig/SWIG/Examples/r/class/runme.R	2007-11-10 00:49:48 +0000
@@ -1,8 +1,8 @@
-# This file illustrates the shadow-class C++ interface generated
+# This file illustrates the proxy class C++ interface generated
 # by SWIG.
 
-dyn.load('example_wrap.so')
-source('example_wrap.R')
+dyn.load(paste("example_wrap", .Platform$dynlib.ext, sep=""))
+source("example_wrap.R")
 cacheMetaData(1)
 
 # ----- Object creation -----

=== modified file 'swig/SWIG/Examples/r/simple/runme.R'
--- a/swig/SWIG/Examples/r/simple/runme.R	2007-11-04 21:32:20 +0000
+++ b/swig/SWIG/Examples/r/simple/runme.R	2007-11-10 00:49:48 +0000
@@ -1,7 +1,7 @@
 # file: runme.R
 
-dyn.load('example_wrap.so')
-source('example_wrap.R')
+dyn.load(paste("example_wrap", .Platform$dynlib.ext, sep=""))
+source("example_wrap.R")
 cacheMetaData(1)
 
 # Call our gcd() function

=== modified file 'swig/SWIG/Examples/test-suite/r/copy_struct_runme.R'
--- a/swig/SWIG/Examples/test-suite/r/copy_struct_runme.R	2007-11-04 21:32:20 +0000
+++ b/swig/SWIG/Examples/test-suite/r/copy_struct_runme.R	2007-11-10 00:49:48 +0000
@@ -1,6 +1,6 @@
-source('unittest.R')
-dyn.load('copy_struct_wrap.so')
-source('copy_struct_wrap.R')
+source("unittest.R")
+dyn.load(paste("copy_struct_wrap", .Platform$dynlib.ext, sep=""))
+source("copy_struct_wrap.R")
 cacheMetaData(1)
 
 a <- getA()
@@ -51,7 +51,7 @@
 aa = A()
 aa$i = 201
 aa$d = pi
-aa$str = 'foo'
+aa$str = "foo"
 copyToR(aa)
 
 

=== modified file 'swig/SWIG/Examples/test-suite/r/double_delete_runme.R'
--- a/swig/SWIG/Examples/test-suite/r/double_delete_runme.R	2007-11-04 21:32:20 +0000
+++ b/swig/SWIG/Examples/test-suite/r/double_delete_runme.R	2007-11-10 00:49:48 +0000
@@ -1,8 +1,8 @@
 # This file illustrates the proxy class C++ interface generated
 # by SWIG.
 
-dyn.load('double_delete_wrap.so')
-source('double_delete_wrap.R')
+dyn.load(paste("double_delete_wrap", .Platform$dynlib.ext, sep=""))
+source("double_delete_wrap.R")
 cacheMetaData(1)
 
 # ----- Object creation -----

=== modified file 'swig/SWIG/Examples/test-suite/r/funcptr_runme.R'
--- a/swig/SWIG/Examples/test-suite/r/funcptr_runme.R	2007-11-04 21:32:20 +0000
+++ b/swig/SWIG/Examples/test-suite/r/funcptr_runme.R	2007-11-10 00:49:48 +0000
@@ -1,7 +1,7 @@
-source('unittest.R')
-dyn.load('funcptr_wrap.so')
-source('funcptr_wrap.R')
+source("unittest.R")
+dyn.load(paste("funcptr_wrap", .Platform$dynlib.ext, sep=""))
+source("funcptr_wrap.R")
 cacheMetaData(1)
 unittest(do_op(1, 3, add), 4)
 unittest(do_op(2, 3, mul), 6)
-unittest(do_op(2, 3, funcvar()), 5)
\ No newline at end of file
+unittest(do_op(2, 3, funcvar()), 5)

=== modified file 'swig/SWIG/Examples/test-suite/r/ignore_parameter_runme.R'
--- a/swig/SWIG/Examples/test-suite/r/ignore_parameter_runme.R	2007-11-04 21:32:20 +0000
+++ b/swig/SWIG/Examples/test-suite/r/ignore_parameter_runme.R	2007-11-10 00:49:48 +0000
@@ -1,10 +1,10 @@
-source('unittest.R')
-dyn.load('ignore_parameter_wrap.so')
-source('ignore_parameter_wrap.R')
+source("unittest.R")
+dyn.load(paste("ignore_parameter_wrap", .Platform$dynlib.ext, sep=""))
+source("ignore_parameter_wrap.R")
 cacheMetaData(1)
 
 unittest(jaguar(1, 1.0), "hello")
-q(save='no')
+q(save="no")
 
 
 

=== modified file 'swig/SWIG/Examples/test-suite/r/legacy_runme.R'
--- a/swig/SWIG/Examples/test-suite/r/legacy_runme.R	2007-11-04 21:32:20 +0000
+++ b/swig/SWIG/Examples/test-suite/r/legacy_runme.R	2007-11-10 00:49:48 +0000
@@ -1,6 +1,6 @@
-source('unittest.R')
-dyn.load('legacy_wrap.so')
-source('legacy_wrap.R')
+source("unittest.R")
+dyn.load(paste("legacy_wrap", .Platform$dynlib.ext, sep=""))
+source("legacy_wrap.R")
 cacheMetaData(1)
 
 obj <- getObject(1,3)
@@ -22,7 +22,7 @@
 unittest(getUnsignedLong(), 23123)
 unittest(getChar(), "A")
 
-q(save='no')
+q(save="no")
 
 
 

=== modified file 'swig/SWIG/Examples/test-suite/r/simple_array_runme.R'
--- a/swig/SWIG/Examples/test-suite/r/simple_array_runme.R	2007-11-04 21:32:20 +0000
+++ b/swig/SWIG/Examples/test-suite/r/simple_array_runme.R	2007-11-10 00:49:48 +0000
@@ -1,9 +1,9 @@
-source('unittest.R')
-dyn.load('simple_array_wrap.so')
-source('simple_array_wrap.R')
+source("unittest.R")
+dyn.load(paste("simple_array_wrap", .Platform$dynlib.ext, sep=""))
+source("simple_array_wrap.R")
 cacheMetaData(1)
 initArray()
 
-q(save='no')
+q(save="no")
 
 

=== modified file 'swig/SWIG/Examples/test-suite/r/unions_runme.R'
--- a/swig/SWIG/Examples/test-suite/r/unions_runme.R	2007-11-04 21:32:20 +0000
+++ b/swig/SWIG/Examples/test-suite/r/unions_runme.R	2007-11-10 00:49:48 +0000
@@ -1,12 +1,12 @@
-source('unittest.R')
-dyn.load('unions_wrap.so')
-source('unions_wrap.R')
+source("unittest.R")
+dyn.load(paste("unions_wrap", .Platform$dynlib.ext, sep=""))
+source("unions_wrap.R")
 cacheMetaData(1)
 
 ss <- SmallStruct()
 
 bstruct <- BigStruct()
 
-q(save='no')
+q(save="no")
 
 

=== modified file 'swig/SWIG/Lib/perl5/perlrun.swg'
--- a/swig/SWIG/Lib/perl5/perlrun.swg	2007-11-04 21:32:20 +0000
+++ b/swig/SWIG/Lib/perl5/perlrun.swg	2007-11-10 00:49:48 +0000
@@ -95,33 +95,41 @@
 #  endif 
 #endif 
 
-/* Note: SwigMagicFuncHack is a typedef used to get the C++ compiler to just shut up
already */
-
 #ifdef PERL_OBJECT
 #define MAGIC_PPERL  CPerlObj *pPerl = (CPerlObj *) this;
+
+#ifdef __cplusplus
+extern "C" {
+#endif
 typedef int (CPerlObj::*SwigMagicFunc)(SV *, MAGIC *);
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-typedef int (CPerlObj::*SwigMagicFuncHack)(SV *, MAGIC *);
 #ifdef __cplusplus
 }
 #endif
 
 #define SWIG_MAGIC(a,b) (SV *a, MAGIC *b)
+
+#ifdef __cplusplus
+#define SWIGCLASS_STATIC extern "C"
+#else
 #define SWIGCLASS_STATIC
+#endif
+
 #else
 #define MAGIC_PPERL
+
+#ifdef __cplusplus
+#define SWIGCLASS_STATIC extern "C" static SWIGUNUSED
+#else
 #define SWIGCLASS_STATIC static SWIGUNUSED
+#endif
+
 #ifndef MULTIPLICITY
 #define SWIG_MAGIC(a,b) (SV *a, MAGIC *b)
+
+#ifdef __cplusplus
+extern "C" {
+#endif
 typedef int (*SwigMagicFunc)(SV *, MAGIC *);
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-typedef int (*SwigMagicFuncHack)(SV *, MAGIC *);
 #ifdef __cplusplus
 }
 #endif
@@ -129,12 +137,12 @@
 
 #else
 #define SWIG_MAGIC(a,b) (struct interpreter *interp, SV *a, MAGIC *b)
+
+#ifdef __cplusplus
+extern "C" {
+#endif
 typedef int (*SwigMagicFunc)(struct interpreter *, SV *, MAGIC *);
 #ifdef __cplusplus
-extern "C" {
-#endif
-typedef int (*SwigMagicFuncHack)(struct interpreter *, SV *, MAGIC *);
-#ifdef __cplusplus
 }
 #endif
 
@@ -426,8 +434,8 @@
   sv_magic(sv,sv,'U',(char *) name,strlen(name));
   mg = mg_find(sv,'U');
   mg->mg_virtual = (MGVTBL *) malloc(sizeof(MGVTBL));
-  mg->mg_virtual->svt_get = (SwigMagicFuncHack) get;
-  mg->mg_virtual->svt_set = (SwigMagicFuncHack) set;
+  mg->mg_virtual->svt_get = (SwigMagicFunc) get;
+  mg->mg_virtual->svt_set = (SwigMagicFunc) set;
   mg->mg_virtual->svt_len = 0;
   mg->mg_virtual->svt_clear = 0;
   mg->mg_virtual->svt_free = 0;

=== modified file 'swig/SWIG/Source/Modules/main.cxx'
--- a/swig/SWIG/Source/Modules/main.cxx	2007-11-04 21:32:20 +0000
+++ b/swig/SWIG/Source/Modules/main.cxx	2007-11-10 00:49:48 +0000
@@ -7,7 +7,7 @@
  * Main entry point to the SWIG core.
  * ----------------------------------------------------------------------------- */
 
-char cvsroot_main_cxx[] = "$Id: main.cxx 10003 2007-10-17 21:42:11Z wsfulton $";
+char cvsroot_main_cxx[] = "$Id: main.cxx 10095 2007-11-09 08:59:44Z olly $";
 
 #include "swigconfig.h"
 
@@ -132,7 +132,8 @@
 Options can also be defined using the SWIG_FEATURES environment variable, for example:\n\
 \n\
   $ SWIG_FEATURES=\"-Wall\"\n\
-  $ swig -python interface.i \n\
+  $ export SWIG_FEATURES\n\
+  $ swig -python interface.i\n\
 \n\
 is equivalent to: \n\
 \n\

=== modified file 'swig/SWIG/Source/Modules/r.cxx'
--- a/swig/SWIG/Source/Modules/r.cxx	2007-11-04 21:32:20 +0000
+++ b/swig/SWIG/Source/Modules/r.cxx	2007-11-10 00:49:48 +0000
@@ -7,7 +7,7 @@
  * R language module for SWIG.
  * ----------------------------------------------------------------------------- */
 
-char cvsroot_r_cxx[] = "$Id: r.cxx 10059 2007-10-28 18:21:44Z drjoe $";
+char cvsroot_r_cxx[] = "$Id: r.cxx 10092 2007-11-08 21:41:25Z wsfulton $";
 
 #include "swigmod.h"
 
@@ -293,6 +293,7 @@
 
 class R : public Language {
 public:
+  R();
   void registerClass(Node *n);
   void main(int argc, char *argv[]);
   int top(Node *n);
@@ -337,10 +338,6 @@
   String *runtimeCode();
   
 protected:
-  bool debugMode;
-  bool copyStruct;
-  bool memoryProfile;
-  bool aggressiveGc;
   int addRegistrationRoutine(String *rname, int nargs);
   int outputRegistrationRoutines(File *out);
   
@@ -400,19 +397,25 @@
   void addAccessor(String *memberName, Wrapper *f, 
 		   String *name, int isSet = -1);
   
+  static int getFunctionPointerNumArgs(Node *n, SwigType *tt);
+
 protected: 
+  bool copyStruct;
+  bool memoryProfile;
+  bool aggressiveGc;
+
   // Strings into which we cumulate the generated code that is to be written
   //vto the files.
-  String *sfile, 
-    *f_init,
-    *s_classes,
-    *f_runtime,
-    *f_wrapper,
-    *s_header, 
-    *f_wrappers,
-    *s_init,
-    *s_init_routine,
-    *s_namespace;
+  String *sfile;
+  String *f_init;
+  String *s_classes;
+  String *f_runtime;
+  String *f_wrapper;
+  String *s_header;
+  String *f_wrappers;
+  String *s_init;
+  String *s_init_routine;
+  String *s_namespace;
   
   // State variables that carry information across calls to functionWrapper() 
   // from  member accessors and class declarations. 
@@ -424,7 +427,8 @@
   
   
   int processing_class_member_function;
-  List *class_member_functions, *class_member_set_functions;
+  List *class_member_functions;
+  List *class_member_set_functions;
   
   /* */
   Hash *ClassMemberTable;
@@ -456,13 +460,59 @@
   bool    outputNamespaceInfo;
   
   String *UnProtectWrapupCode;
+
+  // Static members
+  static bool debugMode;
 };
 
-
-static int getFunctionPointerNumArgs(Node *n, SwigType *tt) {
+R::R() :
+  copyStruct(),
+  memoryProfile(),
+  aggressiveGc(),
+  sfile(),
+  f_init(),
+  s_classes(),
+  f_runtime(),
+  f_wrapper(),
+  s_header(),
+  f_wrappers(),
+  s_init(),
+  s_init_routine(),
+  s_namespace(),
+  opaqueClassDeclaration(),
+  processing_variable(),
+  processing_member_access_function(),
+  member_name(),
+  class_name(),
+  processing_class_member_function(),
+  class_member_functions(),
+  class_member_set_functions(),
+  ClassMemberTable(),
+  ClassMethodsTable(),
+  SClassDefs(),
+  SMethodInfo(),
+  registrationTable(),
+  functionPointerProxyTable(),
+  namespaceFunctions(),
+  namespaceMethods(),
+  namespaceClasses(),
+  Argv(),
+  Argc(),
+  inCPlusMode(),
+  DllName(),
+  Rpackage(),
+  noInitializationCode(),
+  outputNamespaceInfo(),
+  UnProtectWrapupCode() {
+}
+
+bool R::debugMode = false;
+
+int R::getFunctionPointerNumArgs(Node *n, SwigType *tt) {
   (void) tt;
   n = Getattr(n, "type");
-  Printf(stderr, "type: %s\n", n);
+  if (debugMode)
+    Printf(stderr, "type: %s\n", n);
 #if 0
   SwigType *tmp = SwigType_typedef_resolve(tt);
   
@@ -470,7 +520,8 @@
 #endif
   
   ParmList *parms(Getattr(n, "parms"));
-  Printf(stderr, "parms = %p\n", parms);
+  if (debugMode)
+    Printf(stderr, "parms = %p\n", parms);
   return ParmList_len(parms);
 }
 
@@ -560,12 +611,12 @@
   emit_attach_parmmaps(parms,f);
 
   /*  Using weird name and struct to avoid potential conflicts. */
-  Wrapper_add_local(f, "__r_swig_cb_data", 
-		    "RCallbackFunctionData *__r_swig_cb_data = R_SWIG_getCallbackFunctionData()");
-  String *lvar = NewString("__r_swig_cb_data");
+  Wrapper_add_local(f, "r_swig_cb_data", 
+		    "RCallbackFunctionData *r_swig_cb_data = R_SWIG_getCallbackFunctionData()");
+  String *lvar = NewString("r_swig_cb_data");
 
-  Wrapper_add_local(f, "__tmp", "SEXP __tmp"); // for use in converting arguments to R
objects for call.
-  Wrapper_add_local(f, "__r_nprotect", "int __r_nprotect = 0"); // for use in converting
arguments to R objects for call.
+  Wrapper_add_local(f, "r_tmp", "SEXP r_tmp"); // for use in converting arguments to R
objects for call.
+  Wrapper_add_local(f, "r_nprotect", "int r_nprotect = 0"); // for use in converting
arguments to R objects for call.
   Wrapper_add_local(f, "r_vmax", "char * r_vmax= 0"); // for use in converting arguments
to R objects for call.
 
   // Add local for error code in return value.  This is not in emit_args because that
assumes an out typemap
@@ -592,14 +643,14 @@
     String *tm = Getattr(p, "tmap:out");
     if(tm) {
       Replaceall(tm, "$1", name);
-      Replaceall(tm, "$result", "__tmp");
+      Replaceall(tm, "$result", "r_tmp");
       replaceRClass(tm, Getattr(p,"type"));
       Replaceall(tm,"$owner", "R_SWIG_EXTERNAL");
     } 
     
     Printf(setExprElements, "%s\n", tm);
-    Printf(setExprElements, "SETCAR(__r_swig_cb_data->el, %s);\n", "__tmp");
-    Printf(setExprElements, "__r_swig_cb_data->el =
CDR(__r_swig_cb_data->el);\n\n");
+    Printf(setExprElements, "SETCAR(r_swig_cb_data->el, %s);\n", "r_tmp");
+    Printf(setExprElements, "r_swig_cb_data->el = CDR(r_swig_cb_data->el);\n\n");
     
     Printf(s_paramTypes, "'%s'", SwigType_manglestr(tt));
     
@@ -614,23 +665,23 @@
   Printf(f->def,  ")\n{\n");
   
   Printf(f->code, "PROTECT(%s->expr = allocVector(LANGSXP, %d));\n", lvar, nargs +
1);
-  Printf(f->code, "__r_nprotect++;\n");
-  Printf(f->code, "__r_swig_cb_data->el = __r_swig_cb_data->expr;\n\n");
+  Printf(f->code, "r_nprotect++;\n");
+  Printf(f->code, "r_swig_cb_data->el = r_swig_cb_data->expr;\n\n");
   
-  Printf(f->code, "SETCAR(__r_swig_cb_data->el, __r_swig_cb_data->fun);\n");
-  Printf(f->code, "__r_swig_cb_data->el = CDR(__r_swig_cb_data->el);\n\n");
+  Printf(f->code, "SETCAR(r_swig_cb_data->el, r_swig_cb_data->fun);\n");
+  Printf(f->code, "r_swig_cb_data->el = CDR(r_swig_cb_data->el);\n\n");
   
   Printf(f->code, "%s\n\n", setExprElements);
   
-  Printv(f->code, "__r_swig_cb_data->retValue = R_tryEval(", 
-	 "__r_swig_cb_data->expr,",
+  Printv(f->code, "r_swig_cb_data->retValue = R_tryEval(", 
+	 "r_swig_cb_data->expr,",
 	 " R_GlobalEnv,",
-	 " &__r_swig_cb_data->errorOccurred",
+	 " &r_swig_cb_data->errorOccurred",
 	 ");\n", 
 	 NIL);
   
   Printv(f->code, "\n",
-	 "if(__r_swig_cb_data->errorOccurred) {\n",
+	 "if(r_swig_cb_data->errorOccurred) {\n",
 	 "R_SWIG_popCallbackFunctionData(1);\n",
 	 "PROBLEM \"error in calling R function as a function pointer (",
 	 funName,
@@ -656,7 +707,7 @@
       String *tm = returnTM;
       SwigType *retType = base; // Getattr(n, "type");
       
-      Replaceall(tm,"$input", "__r_swig_cb_data->retValue");
+      Replaceall(tm,"$input", "r_swig_cb_data->retValue");
       Replaceall(tm,"$target", "result");
       replaceRClass(tm, retType);
       Replaceall(tm,"$owner", "R_SWIG_EXTERNAL");
@@ -696,7 +747,7 @@
 
 void R::init() {
   UnProtectWrapupCode =  
-    NewStringf("%s", "vmaxset(r_vmax);\nif(__r_nprotect)  UNPROTECT(__r_nprotect);\n\n");
+    NewStringf("%s", "vmaxset(r_vmax);\nif(r_nprotect)  UNPROTECT(r_nprotect);\n\n");
   
   SClassDefs = NewHash();
   
@@ -737,23 +788,12 @@
     DllName = Copy(module);
   Append(DllName, "_wrap");
 
-
   if(outputNamespaceInfo) {
     s_namespace = NewString("");
     Swig_register_filebyname("snamespace", s_namespace);
     Printf(s_namespace, "useDynLib(%s)\n", DllName);
-  } else {
-    String *dev = NewString("/dev/null");
-    File *devnull = NewFile(dev, "w+");
-    Delete(dev);
-    if(!devnull) {
-      FileErrorDisplay(dev);
-      SWIG_exit(EXIT_FAILURE);
-    }
-    Swig_register_filebyname("snamespace", devnull);    
   }
 
-
   /* Associate the different streams with names so that they can be used in %insert
directives by the
      typemap code. */
   Swig_register_filebyname("sinit", s_init);
@@ -1756,7 +1796,7 @@
   num_required = emit_num_required(l);
   varargs = emit_isvarargs(l);
 
-  Wrapper_add_local(f, "__r_nprotect", "unsigned int __r_nprotect = 0");
+  Wrapper_add_local(f, "r_nprotect", "unsigned int r_nprotect = 0");
   Wrapper_add_localv(f, "r_ans", "SEXP", "r_ans = R_NilValue", NIL);
   Wrapper_add_localv(f, "r_vmax", "VMAXTYPE", "r_vmax = vmaxget()", NIL);
 
@@ -1999,7 +2039,7 @@
     if(!isVoidReturnType)
       Printf(tmp, "PROTECT(r_ans);\n");
 
-    Printf(tmp, "PROTECT(R_OutputValues = NEW_LIST(%d));\n__r_nprotect += %d;\n", 
+    Printf(tmp, "PROTECT(R_OutputValues = NEW_LIST(%d));\nr_nprotect += %d;\n", 
 	   numOutArgs + !isVoidReturnType, 
 	   isVoidReturnType ? 1 : 2);
 
@@ -2178,7 +2218,7 @@
   Wrapper_add_local(cGetItem, "ptr", tmp);
   Wrapper_add_local(cGetItem, "r_ans", "SEXP r_ans");
   Wrapper_add_local(cGetItem, "result", tmp1);
-  Wrapper_add_local(cGetItem, "__r_nprotect", "int __r_nprotect = 0");
+  Wrapper_add_local(cGetItem, "r_nprotect", "int r_nprotect = 0");
 
   Printf(cGetItem->code, "ptr = (%s *) R_SWIG_resolveExternalRef(s_x, \"\", \"s_x\",
0);\n", SwigType_lstr(base, 0));
   Printf(cGetItem->code, "result = ptr[INTEGER(s_i)[0]];\n");
@@ -2200,7 +2240,7 @@
   /*
     R_SWIG_..._set_item(SEXP x, SEXP s_i, SEXP s_value) {
     char *r_vmax = vmaxget();
-    int __r_nprotect = 0;
+    int r_nprotect = 0;
     type *ptr, *el, value;
   
     ptr = (type *) R_SWIG_resolveExternalRef(s_x, "", "s_x", 0);
@@ -2220,7 +2260,7 @@
     tmp1 = NewStringf("%s value", SwigType_lstr(base, 0));
 
     Wrapper_add_localv(cSetItem, "r_vmax", "VMAXTYPE", "r_vmax = vmaxget()", NIL);
-    Wrapper_add_local(cSetItem, "__r_nprotect", "int __r_nprotect = 0");
+    Wrapper_add_local(cSetItem, "r_nprotect", "int r_nprotect = 0");
 
     Wrapper_add_local(cSetItem, "ptr", tmp);
     Wrapper_add_local(cSetItem, "value", tmp1);
@@ -2582,14 +2622,14 @@
   Wrapper_add_localv(toR, "r_obj", "SEXP", "r_obj", NIL);
   Wrapper_add_localv(toR, "r_vmax", "VMAXTYPE", "r_vmax = vmaxget()", NIL);
   Wrapper_add_localv(toR, "_tmp_sexp", "SEXP", "_tmp_sexp", NIL);
-  Wrapper_add_local(toR, "__r_nprotect", "int __r_nprotect = 0");
+  Wrapper_add_local(toR, "r_nprotect", "int r_nprotect = 0");
   Wrapper_add_local(toC, "ecode", "int ecode = 0");
 
   Printf(copyToR->def, "%sCopyToR = function(value, obj = new(\"%s\"))\n{\n", name,
name);
   Printf(copyToC->def, "%sCopyToC = function(value, obj)\n{\n", name);
 
 
-  Printf(toR->code, "PROTECT(r_obj =
NEW_OBJECT(MAKE_CLASS(\"%s\")));\n__r_nprotect++;\n\n", name);
+  Printf(toR->code, "PROTECT(r_obj =
NEW_OBJECT(MAKE_CLASS(\"%s\")));\nr_nprotect++;\n\n", name);
 
   Wrapper_add_localv(toC, "_tmp_sexp", "SEXP", "_tmp_sexp", NIL);
 
@@ -2645,8 +2685,8 @@
       replaceRClass(tm,elType);
 
 
-      Printf(toR->code, "%s\nPROTECT(_tmp_sexp);\n__r_nprotect++;\n", tm);
-      Printf(toR->code, "PROTECT(r_obj = R_do_slot_assign(r_obj, mkString(\"%s\"),
_tmp_sexp));\n__r_nprotect++;\n\n", elName);
+      Printf(toR->code, "%s\nPROTECT(_tmp_sexp);\nr_nprotect++;\n", tm);
+      Printf(toR->code, "PROTECT(r_obj = R_do_slot_assign(r_obj, mkString(\"%s\"),
_tmp_sexp));\nr_nprotect++;\n\n", elName);
     } else {
       Printf(stderr, "*** Can't convert field %s in \n", elName);
     }

=== modified file 'swig/SWIG/Tools/mkwindows.sh'
--- a/swig/SWIG/Tools/mkwindows.sh	2007-11-04 21:32:20 +0000
+++ b/swig/SWIG/Tools/mkwindows.sh	2007-11-10 00:49:48 +0000
@@ -21,8 +21,9 @@
     fi
 else
     echo "Usage: mkwindows.sh version [zip]"
+    echo "       Build Windows distribution. Works on Cygwin, MinGW or Linux"
     echo "       version should be 1.3.x"
-    echo "       zip is full path to zip program - default is /c/cygwin/bin/zip on MinGW,
zip on Linux"
+    echo "       zip is full path to zip program - default is /c/cygwin/bin/zip on MinGW,
zip on Linux and Cygwin"
     exit 1
 fi
 

=== modified file 'swig/SWIG/configure.in'
--- a/swig/SWIG/configure.in	2007-11-04 21:32:20 +0000
+++ b/swig/SWIG/configure.in	2007-11-10 00:49:48 +0000
@@ -793,7 +793,7 @@
   if test "$JAVAMDDIR" = "" ; then
     AC_MSG_RESULT(not found)
   else
-    JAVAMDDIR=`dirname "$JAVAMDDIR" | tail -n 1`
+    JAVAMDDIR=`dirname "$JAVAMDDIR" | tail -1`
     JAVAINC="${JAVAINC} -I\"$JAVAMDDIR\""
     AC_MSG_RESULT($JAVAMDDIR)
   fi

=== modified file 'swig/update_from_swigsvn.sh'
--- a/swig/update_from_swigsvn.sh	2007-11-04 22:52:01 +0000
+++ b/swig/update_from_swigsvn.sh	2007-11-10 00:49:48 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-bzr diff -rtag:SWIG_BASE SWIG > SWIG.patch 
+bzr diff -r243 SWIG > SWIG.patch 
 rm -rf SWIG
 svn export https://swig.svn.sourceforge.net/svnroot/swig/trunk SWIG
 rm SWIG/Tools/config/config.guess SWIG/Tools/config/config.sub

Thread
Rev 243: Updated from upstream swig. in http://bazaar.launchpad.net/~ndb-connectors/ndb-connectors/ndbjmergeMonty Taylor10 Nov