Use obligatory macros

See 46f7501

Author: sethrj

Source/Modules/fortran.cxx

@@ -856,7 +856,6 @@ int FORTRAN::top(Node *n) {
     }
   }
 
-  Printf(f_runtime, "\n\n#ifndef SWIGFORTRAN\n#define SWIGFORTRAN\n#endif\n\n");
   if (directorsEnabled()) {
     Printf(f_runtime, "#define SWIG_DIRECTORS\n");
 
@@ -931,6 +930,8 @@ void FORTRAN::write_wrapper(String *filename) {
   // Write SWIG auto-generation banner
   Swig_banner(out);
 
+  Swig_obligatory_macros(f_runtime, "FORTRAN");
+
   // Write different sections
   Dump(f_begin, out);
   Dump(f_runtime, out);

Source/Swig/misc.c

@@ -73,7 +73,8 @@ String *Swig_package_version_hex(void) {
   char *token;
   String *vers = NewString("SWIG_VERSION 0x");
   int count = 0;
-  if (token = strstr(Char(package_version), "+")) {
+  token = strstr(Char(package_version), "+");
+  if (token) {
     // Remove '+' suffix
     *token = '\0';
   }