* as/asranlib/asranlib.h: changed type of offset to unsigned int to

  make it work on ppc Mac OS X (off_t is 64 bit and is not converted
  to 32 bit unsigned int when calling sputl() since it is a macro
* as/link/lkar.c: changed the initialization of This->loaded

git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@5348 4a8a32a2-be11-0410-ad9d-d568d2c75423

diff --git a/ChangeLog b/ChangeLog
index 82d96ade0117926424b3e2d96c7c4a3189cf4c94..22884ac8bf5b694cbe4d0765b4e5dc098d4273bf 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-01-24 Borut Razem <borut.razem AT siol.net>
+
+       * as/asranlib/asranlib.h: changed type of offset to unsigned int to
+         make it work on ppc Mac OS X (off_t is 64 bit and is not converted
+         to 32 bit unsigned int when calling sputl() since it is a macro
+       * as/link/lkar.c: changed the initialization of This->loaded
+
 2009-01-23 Borut Razem <borut.razem AT siol.net>
 
        * as/link/lkar.h: changed type of ar_size to size_t to make it work on

diff --git a/as/asranlib/asranlib.c b/as/asranlib/asranlib.c
index 01977beb8aa04b1d5de487c72511b34af5dd5280..e5449cfdf7490cb8c2e68b4b68b2169d6f57e3ce 100644 (file)
--- a/as/asranlib/asranlib.c
+++ b/as/asranlib/asranlib.c
@@ -93,7 +93,7 @@ struct symbol_s
   };
 
 struct symbol_s *symlist, *lastsym;
-off_t offset, first_member_offset;
+unsigned int offset, first_member_offset;
 
 int
 add_symbol (const char *sym, void *param)

diff --git a/as/link/lkar.c b/as/link/lkar.c
index 6a9cc3749d4ce400fe345a93854ee98206c2593a..b137ffde58a45394a69d9411f4418daf3f9abdc4 100644 (file)
--- a/as/link/lkar.c
+++ b/as/link/lkar.c
@@ -290,7 +290,7 @@ buildlibraryindex_ar (struct lbname *lbnh, FILE * libfp, pmlibraryfile This, int
                       This = This->next;
                     }
                   This->next = NULL;
-                  This->loaded = -1;
+                  This->loaded = 0;
                   This->libspc = lbnh->libspc;
                   This->offset = offset;
                   This->relfil = get_member_name_by_offset (libfp, offset);     /* member name */
@@ -308,7 +308,6 @@ buildlibraryindex_ar (struct lbname *lbnh, FILE * libfp, pmlibraryfile This, int
                   ThisSym->next = (pmlibrarysymbol) new (sizeof (mlibrarysymbol));
                   ThisSym = ThisSym->next;
                 }
-              This->loaded = 0;
               ThisSym->next = NULL;
               ThisSym->name = sym;
             }