Changeset 1209 for trunk/src

Timestamp:

Feb 9, 2004, 1:33:40 AM (22 years ago)

Author:

bird

Message:

Fixed comm/public problem

File:

• trunk/src/emx/src/emxomf/weakld.c (modified) (3 diffs, 1 prop)

trunk/src/emx/src/emxomf/weakld.c

@@ -1518 +1518 @@
  *      2. adding a WKEXT where a PUBLIC or COMM exists.
  *      3. adding a WKEXT where a UNDEF which isn't UNCERTAIN exists.
- *      4. adding a COMM where a !WEAK COMM exists.
+ *      4. adding a COMM where a !WEAK COMM or PUBLIC exists.
  *      5. adding a WEAK PUBLIC or WEAK COMM where a PUBLIC or COMM exists.
  *      6. adding a WEAK UNDEF where WEAK UNDEF exists.
@@ -1609 +1609 @@
          *      2. adding a WKEXT where a PUBLIC or COMM exists.
          *      3. adding a WKEXT where a UNDEF which isn't UNCERTAIN exists.
-         *      4. adding a COMM where a !WEAK COMM exists.
+         *      4. adding a COMM where a !WEAK COMM or PUBLIC exists.
          *      5. adding a WEAK PUBLIC or WEAK COMM where a PUBLIC or COMM exists.
          *      6. adding a WEAK UNDEF where WEAK UNDEF exists.
@@ -1625 +1625 @@
             ) || ( /* 4 */
                 (fFlags & WLDSF_TYPEMASK) == WLDSF_COMM
-             && (pSym->fFlags & (WLDSF_TYPEMASK | WLDSF_WEAK)) == WLDSF_COMM
+             && ((pSym->fFlags & (WLDSF_TYPEMASK | WLDSF_WEAK)) == WLDSF_COMM || (pSym->fFlags & WLDSF_TYPEMASK) == WLDSF_PUBLIC)
             ) || ( /* 5 */
                 ((fFlags & (WLDSF_TYPEMASK | WLDSF_WEAK)) == (WLDSF_PUBLIC | WLDSF_WEAK) || (fFlags & (WLDSF_TYPEMASK | WLDSF_WEAK)) == (WLDSF_COMM | WLDSF_WEAK))