Linker complaints if linked modules have conflicting options.

[fw/sdcc] / as / z80 / asdata.c

diff --git a/as/z80/asdata.c b/as/z80/asdata.c
index 4731d1d9a60d78125eef703313ebac2de4771126..26b621e25fa45f4a71a510c8113b951433bf0cfd 100644 (file)
--- a/as/z80/asdata.c
+++ b/as/z80/asdata.c
@@ -13,10 +13,6 @@
 #include <setjmp.h>
 #include <string.h>
 
-#if !defined(_MSC_VER)
-#include <alloc.h>
-#endif
-
 #include "asm.h"
 
 /*)Module      asdata.c
@@ -91,10 +87,10 @@ int xflag;          /*      -x, listing radix flag
                         */
 int    fflag;          /*      -f(f), relocations flagged flag
                         */
-addr_t laddr;          /*      address of current assembler line
+Addr_T laddr;          /*      address of current assembler line
                         *      or value of .if argument
                         */
-addr_t fuzz;           /*      tracks pass to pass changes in the
+Addr_T fuzz;           /*      tracks pass to pass changes in the
                         *      address of symbols caused by
                         *      variable length instruction formats
                         */
@@ -125,6 +121,8 @@ char        tb[NTITL];      /*      Title string buffer
                         */
 char   stb[NSBTL];     /*      Subtitle string buffer
                         */
+char   optsdcc[NINPUT];        /*      sdcc compile options 
+                        */
 
 char   symtbl[] = { "Symbol Table" };
 char   aretbl[] = { "Area Table" };
@@ -151,7 +149,7 @@ char        module[NCPS];   /*      module name string
  *             char    m_id[NCPS];     Mnemonic
  *             char    m_type;         Mnemonic subtype
  *             char    m_flag;         Mnemonic flags
- *             addr_t  m_valu;         Value
+ *             Addr_T  m_valu;         Value
  *     };
  */
 struct mne     *mnehash[NHASH];
@@ -178,7 +176,7 @@ struct      mne     *mnehash[NHASH];
  *             char    s_flag;         Symbol flags
  *             struct  area *s_area;   Area line, 0 if absolute
  *             int     s_ref;          Ref. number
- *             addr_t  s_addr;         Address
+ *             Addr_T  s_addr;         Address
  *     };
  */
 struct sym     sym[] = {
@@ -210,8 +208,8 @@ struct      sym *symhash[NHASH];    /*      array of pointers to NHASH
  *             struct  area *a_ap;     Area link
  *             char    a_id[NCPS];     Area Name
  *             int     a_ref;          Reference number
- *             addr_t  a_size;         Area size
- *             addr_t  a_fuzz;         Area fuzz
+ *             Addr_T  a_size;         Area size
+ *             Addr_T  a_fuzz;         Area fuzz
  *             int     a_flag;         Area flags
  *     };
  */