This commit was generated by cvs2svn to compensate for changes in r7534,

[chise/xemacs-chise.git.1] / lib-src / ellcc.c

diff --git a/lib-src/ellcc.c b/lib-src/ellcc.c
index 0207a92..53bd780 100644 (file)
--- a/lib-src/ellcc.c
+++ b/lib-src/ellcc.c
@@ -61,6 +61,7 @@ See the samples for more details.
 #include <config.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <config.h>
 #include <stdio.h>
 #include <stdlib.h>

+#include <stddef.h>

 #include <string.h>
 #include <ctype.h>
 #include <errno.h>
 #include <string.h>
 #include <ctype.h>
 #include <errno.h>

@@ -120,16 +121,19 @@ static void do_init_mode (void);
 #define ELLCC_LINK_MODE         1
 #define ELLCC_INIT_MODE         2
 
 #define ELLCC_LINK_MODE         1
 #define ELLCC_INIT_MODE         2
 

-int ellcc_mode = ELLCC_COMPILE_MODE;
-char *progname;
-char *mod_name = (char *)0, *mod_version = (char *)0, *mod_title = (char *)0;
-char *mod_output = (char *)0;
-int verbose = 0;
-char **exec_argv;
-int exec_argc = 1, *exec_args;
-int real_argc = 0;
-int prog_argc;
-char **prog_argv;
+static int ellcc_mode = ELLCC_COMPILE_MODE;
+static char *progname;
+static char *mod_name = NULL;
+static char *mod_version = NULL;
+static char *mod_title = NULL;
+static char *mod_output = NULL;
+static int verbose = 0;
+static char **exec_argv;
+static int exec_argc = 1;
+static int *exec_args;
+static int real_argc = 0;
+static int prog_argc;
+static char **prog_argv;

 
 /*
  * We allow the user to over-ride things in the environment
 
 /*
  * We allow the user to over-ride things in the environment

@@ -149,7 +153,7 @@ main (int argc, char *argv[])
   prog_argc = argc;
   prog_argv = argv;
 
   prog_argc = argc;
   prog_argv = argv;
 

-#if defined(MSDOS) || defined(WINDOWSNT)
+#if defined(WIN32_NATIVE)

   tmp = strrchr (argv[0], '\\');
   if (tmp != (char *)0)
     tmp++;
   tmp = strrchr (argv[0], '\\');
   if (tmp != (char *)0)
     tmp++;