Changeset 142 for trunk/src

Timestamp:

May 15, 2003, 11:40:50 AM (22 years ago)

Author:

bird

Message:

#425: DosCopy declaration.

Location:

trunk/src/emx/src

Files:

• emxomf/emxomfld.c (modified) (1 diff, 1 prop)
• ld/ld.c (modified) (9 diffs, 1 prop)

trunk/src/emx/src/emxomf/emxomfld.c

@@ -146 +146 @@
 
 /* To avoid including os2.h... */
+#ifdef _System
+unsigned _System DosCopy (char *, char *, unsigned);
+#else
 unsigned DosCopy (char *, char *, unsigned);
+#endif
 
 

trunk/src/emx/src/ld/ld.c

@@ -82 +82 @@
 
 #define FIXSETBUG
-
+#ifdef _System
+extern int _System DosCopy (char *, char *, int);
+#else
 extern int DosCopy (char *, char *, int);
+#endif
 #endif /* EMX */
 
@@ -954 +957 @@
 int data_reloc_size;            /* total size of data relocation of all input
                                    files.  */
-  
+
 /* The following are computed by write_header().  */
 long int output_text_offset;    /* file offset of the text section.  */
@@ -1404 +1407 @@
           discard_locals = DISCARD_ALL;
           break;
-          
+        
         case 'y':
           {
@@ -1437 +1440 @@
           search_dirs[n_search_dirs - 1] = optarg;
           break;
-          
+        
         case 'M':
           write_map = 1;
@@ -1506 +1509 @@
               = (struct string_list_element *)
                 xmalloc (sizeof (struct string_list_element));
-            
+        
             new->str = optarg;
             new->next = set_element_prefixes;
@@ -1896 +1899 @@
   {
     char magic[SARMAG];
-    
+
     lseek (desc, entry->starting_offset, 0);
     len = read (desc, magic, SARMAG);
@@ -3335 +3338 @@
        goes before bss.  */
     int data_pad_additional = 0;
-    
+
     if (specified_data_size && specified_data_size > data_size)
       data_pad_additional = specified_data_size - data_size;
@@ -4929 +4932 @@
      the way Unix ld works; I'm going to consider it a feature.  */
   (void) unlink (output_filename);
-  
+
 #ifdef __EMX__
   outdesc = open (output_filename, O_WRONLY | O_CREAT | O_TRUNC | O_BINARY, 0666);
@@ -5728 +5731 @@
 #endif
             symtype = symptr->defined & ~N_EXT;
-  
+
 #ifdef EMX /* relocatable */
           if ((force_common_definition || reloc_flag)