fix extern declarations

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

Examples/chicken/multimap/example.i

@@ -1,5 +1,15 @@
 /* File : example.i */
 %module example
+
+%{
+extern int gcd(int x, int y);
+extern int gcdmain(int argc, char *argv[]);
+extern int count(char *bytes, int len, char c);
+extern void capitalize (char *str, int len);
+extern void circle (double cx, double cy);
+extern int squareCubed (int n, int *OUTPUT);
+%}
+
 %include exception.i
 %include typemaps.i
 

Examples/chicken/simple/example.i

@@ -6,8 +6,11 @@
 
 %include typemaps.i
 
+%rename(mod) my_mod;
+
+%inline %{
 extern double My_variable;
 extern int    fact(int);
-%rename(mod) my_mod;
 extern int    my_mod(int n, int m);
 extern char   *get_time();
+%}

Examples/contract/simple_c/example.i

@@ -14,4 +14,6 @@ ensure:
      Circle >= 0;
 }
 
+%inline %{
 extern int Circle (int x, int y, int radius);
+%}

Examples/csharp/funcptr/example.h

@@ -5,3 +5,5 @@ extern int add(int,int);
 extern int sub(int,int);
 extern int mul(int,int);
 
+extern int (*funcvar)(int,int);
+

Examples/csharp/simple/example.i

@@ -1,5 +1,7 @@
 /* File : example.i */
 %module example
 
+%inline %{
 extern int    gcd(int x, int y);
 extern double Foo;
+%}

Examples/csharp/variables/example.i

@@ -5,6 +5,7 @@
 %}
 
 /* Some global variable declarations */
+%inline %{
 extern int              ivar;
 extern short            svar;
 extern long             lvar;
@@ -23,19 +24,26 @@ extern char             name[256];
 
 extern Point           *ptptr;
 extern Point            pt;
+%}
 
 
 /* Some read-only variables */
 
 %immutable;
+
+%inline %{
 extern int  status;
 extern char path[256];
+%}
+
 %mutable;
 
 /* Some helper functions to make it easier to test */
+%inline %{
 extern void  print_vars();
 extern int  *new_int(int value);
 extern Point *new_Point(int x, int y);
 extern char  *Point_print(Point *p);
 extern void  pt_print();
+%}
 

Examples/guile/multimap/example.i

@@ -1,5 +1,15 @@
 /* File : example.i */
 %module example
+
+%{
+extern int gcd(int x, int y);
+extern int gcdmain(int argc, char *argv[]);
+extern int count(char *bytes, int len, char c);
+extern void capitalize (char *str, int len);
+extern void circle (double cx, double cy);
+extern int squareCubed (int n, int *OUTPUT);
+%}
+
 %include exception.i
 %include typemaps.i
 

Examples/guile/simple/example.i

@@ -4,9 +4,11 @@
 /* Put headers and other declarations here */
 %}
 
+%inline %{
 extern double My_variable;
 extern int    fact(int);
 extern int    mod(int n, int m);
 extern char  *get_time();
+%}
 
 %include guile/guilemain.i

Examples/java/funcptr/example.h

@@ -5,3 +5,5 @@ extern int add(int,int);
 extern int sub(int,int);
 extern int mul(int,int);
 
+extern int (*funcvar)(int,int);
+

Examples/java/multimap/example.i

@@ -1,6 +1,15 @@
 /* File : example.i */
 %module example
 
+%{
+extern int gcd(int x, int y);
+extern int gcdmain(int argc, char *argv[]);
+extern int count(char *bytes, int len, char c);
+extern void capitalize (char *str, int len);
+extern void circle (double cx, double cy);
+extern int squareCubed (int n, int *OUTPUT);
+%}
+
 extern int    gcd(int x, int y);
 
 %typemap(jni) (int argc, char *argv[]) "jobjectArray"

Examples/java/pointer/example.i

@@ -1,6 +1,12 @@
 /* File : example.i */
 %module example
 
+%{
+extern void add(int *, int *, int *);
+extern void sub(int *, int *, int *);
+extern int divide(int, int, int *);
+%}
+
 /* This example illustrates a couple of different techniques
    for manipulating C pointers */
 

Examples/java/simple/example.i

@@ -1,5 +1,7 @@
 /* File : example.i */
 %module example
 
+%inline %{
 extern int    gcd(int x, int y);
 extern double Foo;
+%}

Examples/java/variables/example.i

@@ -5,6 +5,7 @@
 %}
 
 /* Some global variable declarations */
+%inline %{
 extern int              ivar;
 extern short            svar;
 extern long             lvar;
@@ -23,22 +24,26 @@ extern char             name[256];
 
 extern Point           *ptptr;
 extern Point            pt;
+%}
 
 
 /* Some read-only variables */
 
 %immutable;
+
+%inline %{
 extern int  status;
 extern char path[256];
+%}
+
 %mutable;
 
 /* Some helper functions to make it easier to test */
+%inline %{
 extern void  print_vars();
 extern int  *new_int(int value);
 extern Point *new_Point(int x, int y);
 extern char  *Point_print(Point *p);
 extern void  pt_print();
-
+%}
-
-
 

Examples/modula3/simple/example.i

@@ -1,5 +1,7 @@
 /* File : example.i */
 %module Example
 
+%inline %{
 extern int    gcd(int x, int y);
 extern double Foo;
+%}

Examples/mzscheme/multimap/example.i

@@ -1,5 +1,15 @@
 /* File : example.i */
 %module example
+
+%{
+extern int gcd(int x, int y);
+extern int gcdmain(int argc, char *argv[]);
+extern int count(char *bytes, int len, char c);
+extern void capitalize (char *str, int len);
+extern void circle (double cx, double cy);
+extern int squareCubed (int n, int *OUTPUT);
+%}
+
 %include exception.i
 %include typemaps.i
 

Examples/mzscheme/simple/example.i

@@ -6,8 +6,11 @@
 
 %include typemaps.i
 
+%rename(mod) my_mod;
+
+%inline %{
 extern double My_variable;
 extern int    fact(int);
-%name(mod) extern int    my_mod(int n, int m);
 extern int    my_mod(int n, int m);
 extern char   *get_time();
+%}

Examples/ocaml/simple/example.i

@@ -1,5 +1,7 @@
 /* File : example.i */
 %module example
 
+%inline %{
 extern int    gcd(int x, int y);
 extern double Foo;
+%}

Examples/perl5/funcptr/example.h

@@ -5,3 +5,5 @@ extern int add(int,int);
 extern int sub(int,int);
 extern int mul(int,int);
 
+extern int (*funcvar)(int,int);
+

Examples/perl5/multimap/example.i

@@ -1,5 +1,15 @@
 /* File : example.i */
 %module example
+
+%{
+extern int gcd(int x, int y);
+extern int gcdmain(int argc, char *argv[]);
+extern int count(char *bytes, int len, char c);
+extern void capitalize (char *str, int len);
+extern void circle (double cx, double cy);
+extern int squareCubed (int n, int *OUTPUT);
+%}
+
 %include exception.i
 %include typemaps.i
 

Examples/perl5/pointer/example.i

@@ -1,6 +1,12 @@
 /* File : example.i */
 %module example
 
+%{
+extern void add(int *, int *, int *);
+extern void sub(int *, int *, int *);
+extern int divide(int, int, int *);
+%}
+
 /* This example illustrates a couple of different techniques
    for manipulating C pointers */
 

Examples/perl5/simple/example.i

@@ -1,5 +1,7 @@
 /* File : example.i */
 %module example
 
+%inline %{
 extern int    gcd(int x, int y);
 extern double Foo;
+%}

Examples/perl5/value/example.i

@@ -6,8 +6,10 @@
 %}
 
 /* Some functions that manipulate Vectors by value */
+%inline %{
 extern double dot_product(Vector a, Vector b);
 extern Vector vector_add(Vector a, Vector b);
+%}
 
 /* Include this because the vector_add() function will leak memory */
 void   free(void *);

Examples/perl5/variables/example.i

@@ -5,6 +5,7 @@
 %}
 
 /* Some global variable declarations */
+%inline %{
 extern int              ivar;
 extern short            svar;
 extern long             lvar;
@@ -23,22 +24,26 @@ extern char             name[256];
 
 extern Point           *ptptr;
 extern Point            pt;
+%}
 
 
 /* Some read-only variables */
 
 %immutable;
+
+%inline %{
 extern int  status;
 extern char path[256];
+%}
+
 %mutable;
 
 /* Some helper functions to make it easier to test */
+%inline %{
 extern void  print_vars();
 extern int  *new_int(int value);
 extern Point *new_Point(int x, int y);
 extern char  *Point_print(Point *p);
 extern void  pt_print();
-
+%}
-
-
 

Examples/php4/funcptr/example.h

@@ -5,3 +5,5 @@ extern int add(int,int);
 extern int sub(int,int);
 extern int mul(int,int);
 
+extern int (*funcvar)(int,int);
+

Examples/php4/pointer/example.i

@@ -1,6 +1,12 @@
 /* File : example.i */
 %module example
 
+%{
+extern void add(int *, int *, int *);
+extern void sub(int *, int *, int *);
+extern int divide(int, int, int *);
+%}
+
 /* This example illustrates a couple of different techniques
    for manipulating C pointers */
 

Examples/php4/simple/example.i

@@ -1,5 +1,7 @@
 /* File : example.i */
 %module example
 
+%inline %{
 extern int    gcd(int x, int y);
 extern double Foo;
+%}

Examples/php4/value/example.i

@@ -6,8 +6,10 @@
 %}
 
 /* Some functions that manipulate Vectors by value */
+%inline %{
 extern double dot_product(Vector a, Vector b);
 extern Vector vector_add(Vector a, Vector b);
+%}
 
 /* Include this because the vector_add() function will leak memory */
 void   free(void *);

Examples/php4/variables/example.i

@@ -5,6 +5,7 @@
 %}
 
 /* Some global variable declarations */
+%inline %{
 extern int              ivar;
 extern short            svar;
 extern long             lvar;
@@ -23,15 +24,21 @@ extern char             name[256];
 
 extern Point           *ptptr;
 extern Point            pt;
+%}
 
 /* Some read-only variables */
 
 %immutable;
+
+%inline %{
 extern int  status;
 extern char path[256];
+%}
+
 %mutable;
 
 /* Some helper functions to make it easier to test */
+%inline %{
 extern void  print_vars();
 extern int  *new_int(int value);
 extern int   value_ent(int *value);
@@ -39,7 +46,5 @@ extern int   value_ent(int *value);
 extern Point *new_Point(int x, int y);
 extern char  *Point_print(Point *p);
 extern void  pt_print();
-
+%}
-
-
 

Examples/pike/simple/example.i

@@ -1,5 +1,7 @@
 /* File : example.i */
 %module example
 
+%inline %{
 extern int    gcd(int x, int y);
 extern double Foo;
+%}

Examples/python/contract/example.i

@@ -14,6 +14,8 @@ ensure:
 	fact >= 1;
 }
 
+%inline %{
 extern int    gcd(int x, int y);
 extern int    fact(int n);
 extern double Foo;
+%}

Examples/python/funcptr/example.h

@@ -5,3 +5,5 @@ extern int add(int,int);
 extern int sub(int,int);
 extern int mul(int,int);
 
+extern int (*funcvar)(int,int);
+

Examples/python/funcptr2/example.h

@@ -5,3 +5,5 @@ extern int add(int,int);
 extern int sub(int,int);
 extern int mul(int,int);
 
+extern int (*funcvar)(int,int);
+

Examples/python/multimap/example.i

@@ -1,5 +1,15 @@
 /* File : example.i */
 %module example
+
+%{
+extern int gcd(int x, int y);
+extern int gcdmain(int argc, char *argv[]);
+extern int count(char *bytes, int len, char c);
+extern void capitalize (char *str, int len);
+extern void circle (double cx, double cy);
+extern int squareCubed (int n, int *OUTPUT);
+%}
+
 %include exception.i
 %include typemaps.i
 

Examples/python/pointer/example.i

@@ -1,6 +1,12 @@
 /* File : example.i */
 %module example
 
+%{
+extern void add(int *, int *, int *);
+extern void sub(int *, int *, int *);
+extern int divide(int, int, int *);
+%}
+
 /* This example illustrates a couple of different techniques
    for manipulating C pointers */
 

Examples/python/simple/example.i

@@ -1,5 +1,7 @@
 /* File : example.i */
 %module example
 
+%inline %{
 extern int    gcd(int x, int y);
 extern double Foo;
+%}

Examples/python/variables/example.i

@@ -5,6 +5,7 @@
 %}
 
 /* Some global variable declarations */
+%inline %{
 extern int              ivar;
 extern short            svar;
 extern long             lvar;
@@ -23,22 +24,26 @@ extern char             name[256];
 
 extern Point           *ptptr;
 extern Point            pt;
+%}
 
 
 /* Some read-only variables */
 
 %immutable;
+
+%inline %{
 extern int  status;
 extern char path[256];
+%}
+
 %mutable;
 
 /* Some helper functions to make it easier to test */
+%inline %{
 extern void  print_vars();
 extern int  *new_int(int value);
 extern Point *new_Point(int x, int y);
 extern char  *Point_print(Point *p);
 extern void  pt_print();
-
+%}
-
-
 

Examples/ruby/funcptr/example.h

@@ -5,3 +5,5 @@ extern int add(int,int);
 extern int sub(int,int);
 extern int mul(int,int);
 
+extern int (*funcvar)(int,int);
+

Examples/ruby/funcptr2/example.h

@@ -5,3 +5,5 @@ extern int add(int,int);
 extern int sub(int,int);
 extern int mul(int,int);
 
+extern int (*funcvar)(int,int);
+

Examples/ruby/multimap/example.i

@@ -1,5 +1,14 @@
 %module example
 
+%{
+extern int gcd(int x, int y);
+extern int gcdmain(int argc, char *argv[]);
+extern int count(char *bytes, int len, char c);
+extern void capitalize (char *str, int len);
+extern void circle (double cx, double cy);
+extern int squareCubed (int n, int *OUTPUT);
+%}
+
 %include exception.i
 %include typemaps.i
 

Examples/ruby/pointer/example.i

@@ -1,6 +1,12 @@
 /* File : example.i */
 %module example
 
+%{
+extern void add(int *, int *, int *);
+extern void sub(int *, int *, int *);
+extern int divide(int, int, int *);
+%}
+
 /* This example illustrates a couple of different techniques
    for manipulating C pointers */
 

Examples/ruby/simple/example.i

@@ -1,5 +1,7 @@
 /* File : example.i */
 %module example
 
+%inline %{
 extern int    gcd(int x, int y);
 extern double Foo;
+%}

Examples/ruby/value/example.i

@@ -6,8 +6,10 @@
 %}
 
 /* Some functions that manipulate Vectors by value */
+%inline %{
 extern double dot_product(Vector a, Vector b);
 extern Vector vector_add(Vector a, Vector b);
+%}
 
 /* Include this because the vector_add() function will leak memory */
 void   free(void *);

Examples/ruby/variables/example.i

@@ -5,6 +5,7 @@
 %}
 
 /* Some global variable declarations */
+%inline %{
 extern int              ivar;
 extern short            svar;
 extern long             lvar;
@@ -23,22 +24,26 @@ extern char             name[256];
 
 extern Point           *ptptr;
 extern Point            pt;
+%}
 
 
 /* Some read-only variables */
 
 %immutable;
+
+%inline %{
 extern int  status;
 extern char path[256];
+%}
+
 %mutable;
 
 /* Some helper functions to make it easier to test */
+%inline %{
 extern void  print_vars();
 extern int  *new_int(int value);
 extern Point *new_Point(int x, int y);
 extern char  *Point_print(Point *p);
 extern void  pt_print();
-
+%}
-
-
 

Examples/tcl/contract/example.i

@@ -14,6 +14,8 @@ ensure:
 	fact >= 1;
 }
 
+%inline %{
 extern int    gcd(int x, int y);
 extern int    fact(int n);
 extern double Foo;
+%}

Examples/tcl/funcptr/example.h

@@ -5,3 +5,5 @@ extern int add(int,int);
 extern int sub(int,int);
 extern int mul(int,int);
 
+extern int (*funcvar)(int,int);
+

Examples/tcl/multimap/example.i

@@ -1,5 +1,15 @@
 /* File : example.i */
 %module example
+
+%{
+extern int gcd(int x, int y);
+extern int gcdmain(int argc, char *argv[]);
+extern int count(char *bytes, int len, char c);
+extern void capitalize (char *str, int len);
+extern void circle (double cx, double cy);
+extern int squareCubed (int n, int *OUTPUT);
+%}
+
 %include exception.i
 
 extern int    gcd(int x, int y);

Examples/tcl/pointer/example.i

@@ -1,6 +1,12 @@
 /* File : example.i */
 %module example
 
+%{
+extern void add(int *, int *, int *);
+extern void sub(int *, int *, int *);
+extern int divide(int, int, int *);
+%}
+
 /* This example illustrates a couple of different techniques
    for manipulating C pointers */
 

Examples/tcl/simple/example.i

@@ -1,5 +1,7 @@
 /* File : example.i */
 %module example
 
+%inline %{
 extern int    gcd(int x, int y);
 extern double Foo;
+%}

Examples/tcl/value/example.i

@@ -6,8 +6,10 @@
 %}
 
 /* Some functions that manipulate Vectors by value */
+%inline %{
 extern double dot_product(Vector a, Vector b);
 extern Vector vector_add(Vector a, Vector b);
+%}
 
 /* Include this because the vector_add() function will leak memory */
 void   free(void *);

Examples/tcl/variables/example.i

@@ -5,6 +5,7 @@
 %}
 
 /* Some global variable declarations */
+%inline %{
 extern int              ivar;
 extern short            svar;
 extern long             lvar;
@@ -23,22 +24,26 @@ extern char             name[256];
 
 extern Point           *ptptr;
 extern Point            pt;
+%}
 
 
 /* Some read-only variables */
 
 %immutable;
+
+%inline %{
 extern int  status;
 extern char path[256];
+%}
+
 %mutable;
 
 /* Some helper functions to make it easier to test */
+%inline %{
 extern void  print_vars();
 extern int  *new_int(int value);
 extern Point *new_Point(int x, int y);
 extern char  *Point_print(Point *p);
 extern void  pt_print();
-
+%}
-
-