X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fld65%2Fglobal.h;h=6af265f450f7ef6af227b128dcbbb78f13d05583;hb=5a05acf9366e4c1eef73fd4387afc45f6a6cebef;hp=b3cf4502018ce3005d37cc2d5b336981d617cb49;hpb=5422c6924a5683563d9b8e690d5402b112e37033;p=cc65

diff --git a/src/ld65/global.h b/src/ld65/global.h
index b3cf45020..6af265f45 100644
--- a/src/ld65/global.h
+++ b/src/ld65/global.h
@@ -1,15 +1,15 @@
 /*****************************************************************************/
 /*                                                                           */
-/*				   global.h			    	     */
+/*                                 global.h                                  */
 /*                                                                           */
-/*		     Global variables for the ld65 linker	    	     */
+/*                   Global variables for the ld65 linker                    */
 /*                                                                           */
 /*                                                                           */
 /*                                                                           */
-/* (C) 1998-2003 Ullrich von Bassewitz                                       */
-/*               Römerstrasse 52                                             */
-/*               D-70794 Filderstadt                                         */
-/* 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       */
@@ -39,21 +39,23 @@
 
 
 /*****************************************************************************/
-/*     	      	    		     Data				     */
+/*                                   Data                                    */
 /*****************************************************************************/
 
 
 
-extern const char*	OutputName;	/* Name of output file */
+extern const char*      OutputName;     /* Name of output file */
+extern unsigned         OutputNameUsed; /* Output name was used by %O */
 
 extern unsigned         ModuleId;       /* Id for o65 module */
 
 extern unsigned char    HaveStartAddr;  /* True if start address was given */
-extern unsigned long 	StartAddr;	/* Start address */
+extern unsigned long    StartAddr;      /* Start address */
 
-extern unsigned char	VerboseMap;	/* Verbose map file */
-extern const char*	MapFileName;	/* Name of the map file */
-extern const char*	LabelFileName;	/* Name of the label file */
+extern unsigned char    VerboseMap;     /* Verbose map file */
+extern unsigned char    AllowMultDef;   /* Allow multiple definitions */
+extern const char*      MapFileName;    /* Name of the map file */
+extern const char*      LabelFileName;  /* Name of the label file */
 extern const char*      DbgFileName;    /* Name of the debug file */
 
 
@@ -61,6 +63,3 @@ extern const char*      DbgFileName;    /* Name of the debug file */
 /* End of global.h */
 
 #endif
-
-
-