A better fix for bug#661910

[fw/sdcc] / src / SDCCglobl.h

diff --git a/src/SDCCglobl.h b/src/SDCCglobl.h
index 1a62ccc42351e499a2b73d785d30fd6136313549..f9dd2453970545a20c2e3faa11c95615068c7709 100644 (file)
--- a/src/SDCCglobl.h
+++ b/src/SDCCglobl.h
@@ -53,7 +53,6 @@
 #define PATH_MAX 255           /* define a reasonable value */
 #endif
 
-#define  MAX_FNAME_LEN  128
 #define  MAX_REG_PARMS  1
 typedef int bool;
 
@@ -205,7 +204,6 @@ struct options
     int stackAuto;             /* Stack Automatic  */
     int useXstack;             /* use Xternal Stack */
     int stack10bit;            /* use 10 bit stack (flat24 model only) */
-    int genericPtr;            /* use generic pointers */
     int dump_raw;              /* dump after intermediate code generation */
     int dump_gcse;             /* dump after gcse */
     int dump_loop;             /* dump after loop optimizations */
@@ -225,10 +223,8 @@ struct options
     int nopeep;                        /* no peep hole optimization */
     int asmpeep;               /* pass inline assembler thru peep hole */
     int debug;                 /* generate extra debug info */
-    int stackOnData;           /* stack after data segment  */
     int c1mode;                        /* Act like c1 - no pre-proc, asm or link */
     char *peep_file;           /* additional rules for peep hole */
-    char *out_name;            /* Asm output name for c1 mode */
     int nostdlib;              /* Don't use standard lib files */
     int nostdinc;              /* Don't use standard include files */
     int noRegParams;            /* Disable passing some parameters in registers */
@@ -260,8 +256,15 @@ struct options
 extern int noAssemble;         /* no assembly, stop after code generation */
 extern char *yytext;
 extern char *currFname;
-extern char *srcFileName;      /* source file name without the extenstion */
-extern char *moduleName;       /* source file name without path & extension */
+extern char *fullSrcFileName;  /* full name for the source file; */
+                               /* can be NULL while linking without compiling */
+extern char *fullDstFileName;  /* full name for the output file; */
+                               /* only given by -o, otherwise NULL */
+extern char *dstFileName;      /* destination file name without extension */
+extern char *dstPath;          /* path for the output files; */
+                               /* "" is equivalent with cwd */
+extern char *moduleName;       /* module name is source file without path and extension */
+                               /* can be NULL while linking without compiling */
 extern int currLineno;         /* current line number    */
 extern int yylineno;           /* line number of the current file SDCC.lex */
 extern FILE *yyin;             /* */