ld65: implement '--allow-multiple-definition' command line parameter

[cc65] / src / ld65 / global.h

diff --git a/src/ld65/global.h b/src/ld65/global.h
index b3cf4502018ce3005d37cc2d5b336981d617cb49..6af265f450f7ef6af227b128dcbbb78f13d05583 100644 (file)
--- 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
-
-
-