X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fld65%2Fglobal.c;h=59c3754e6338fb837937ebdaf0febdb1c1dbe38b;hb=5a05acf9366e4c1eef73fd4387afc45f6a6cebef;hp=6ac6f9cce3e3d7016126e80edcb79ff332cfc781;hpb=df5132d31c0e3b3cf49460d230870863c10d39d9;p=cc65

diff --git a/src/ld65/global.c b/src/ld65/global.c
index 6ac6f9cce..59c3754e6 100644
--- a/src/ld65/global.c
+++ b/src/ld65/global.c
@@ -1,15 +1,15 @@
 /*****************************************************************************/
 /*                                                                           */
-/*				   global.c				     */
+/*                                 global.c                                  */
 /*                                                                           */
-/*		     Global variables for the ld65 linker		     */
+/*                   Global variables for the ld65 linker                    */
 /*                                                                           */
 /*                                                                           */
 /*                                                                           */
-/* (C) 1998-2002 Ullrich von Bassewitz                                       */
-/*               Wacholderweg 14                                             */
-/*               D-70597 Stuttgart                                           */
-/* EMail:        uz@cc65.org                                                 */
+/* (C) 1998-2010, Ullrich von Bassewitz                                      */
+/*                Roemerstrasse 52                                           */
+/*                D-70794 Filderstadt                                        */
+/* EMail:         uz@cc65.org                                                */
 /*                                                                           */
 /*                                                                           */
 /* This software is provided 'as-is', without any expressed or implied       */
@@ -38,12 +38,13 @@
 
 
 /*****************************************************************************/
-/*     	      	    		     Data				     */
+/*                                   Data                                    */
 /*****************************************************************************/
 
 
 
-const char* OutputName	    = "a.out"; 	/* Name of output file */
+const char* OutputName      = "a.out";  /* Name of output file */
+unsigned    OutputNameUsed  = 0;        /* Output name was used by %O */
 
 unsigned ModuleId           = 0;        /* Id for o65 module */
 
@@ -51,11 +52,8 @@ unsigned ModuleId           = 0;        /* Id for o65 module */
 unsigned char HaveStartAddr = 0;        /* Start address not given */
 unsigned long StartAddr     = 0x200;    /* Start address */
 
-unsigned char VerboseMap    = 0;	/* Verbose map file */
-const char* MapFileName	    = 0;       	/* Name of the map file */
-const char* LabelFileName   = 0;	/* Name of the label file */
+unsigned char VerboseMap    = 0;        /* Verbose map file */
+unsigned char AllowMultDef  = 0;        /* Allow multiple definitions */
+const char* MapFileName     = 0;        /* Name of the map file */
+const char* LabelFileName   = 0;        /* Name of the label file */
 const char* DbgFileName     = 0;        /* Name of the debug file */
-unsigned char WProtSegs     = 0;	/* Mark write protected segments */
-
-
-