Changeset 2818 for trunk/emx/src/emxomf/emxomfld.c

Timestamp:

Oct 10, 2006, 4:53:42 AM (19 years ago)

Author:

bird

Message:

A couple of fixes.

File:

• trunk/emx/src/emxomf/emxomfld.c (modified) (5 diffs)

trunk/emx/src/emxomf/emxomfld.c

@@ -1258 +1258 @@
 /* converts a def file statement to watcom responsfile lingo. */
 
-static def_2_watcom(struct _md *md, const _md_stmt *stmt, _md_token token, void *arg)
+static int def_2_watcom(struct _md *md, const _md_stmt *stmt, _md_token token, void *arg)
 {
   switch (token)
@@ -1286 +1286 @@
           fprintf (response_file, "='%s'", stmt->export.internalname);
         if (stmt->export.flags & _MDEP_RESIDENTNAME)
-          fprintf (response_file, " RESIDENT", stmt->export.internalname);
+          fprintf (response_file, " RESIDENT");
         /** @todo _MDEP_NONAME */
         fprintf (response_file, "\n");
@@ -1336 +1336 @@
 
       case _MD_STACKSIZE:
-        fprintf (response_file, "OPTION STACK=%#ld\n", stmt->stacksize.size);
+        fprintf (response_file, "OPTION STACK=%#lx\n", stmt->stacksize.size);
         break;
 
       case _MD_STUB:
-        fprintf (response_file, "OPTION STUB='%s'\n", stmt->stub.name);
+        if (!stmt->stub.none)
+          fprintf (response_file, "OPTION STUB='%s'\n", stmt->stub.name);
+        else
+          fprintf (stderr, "emxomfld: warning: \"STUB NONE\" is not supported by wlink. ignoring\n");
         break;
 
@@ -2093 +2096 @@
         fprintf (response_file, "OPTION MAP='%s'\n", map_fname);
       else if (map_flag)
-        fprintf (response_file, "OPTION MAP\n", map_fname);
+        fprintf (response_file, "OPTION MAP\n");
 
       /* standard stuff */
@@ -2140 +2143 @@
       if (def_fname)
         {
-          _md_token token;
           struct _md *pMd = _md_open (def_fname);
           if (!pMd)