Changeset 1992 for trunk/src/emx

Timestamp:

Jun 5, 2005, 8:52:28 AM (20 years ago)

Author:

bird

Message:

Allow multiple modules by the same basename. This is not in tradition with other librarians, but it solves incompatible behaviour between emxomfar and ar.

File:

• trunk/src/emx/src/libomflib/omflibcr.c (modified) (1 diff, 1 prop)

trunk/src/emx/src/libomflib/omflibcr.c

@@ -116 +116 @@
           if (*ptr == len && compare (ptr+1, buf+1, len) == 0)
             {
-              strcpy (error, "Symbol multiply defined: ");
-              strcat (error, name);
-              return -1;
+              if (buf[len] != '!')
+                {
+                  strcpy (error, "Symbol multiply defined: ");
+                  strcat (error, name);
+                  return -1;
+                }
+              else
+                {
+                  /* Ignore multiply defined modules. This isn't correct behaviour,
+                     but it helps emxomfar being more compatible with ar. */
+                  return 0;
+                }
             }
         }