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

Timestamp:

Aug 10, 2003, 5:24:21 PM (22 years ago)

Author:

zap

Message:

Fixed conflicts.

File:

• trunk/src/emx/src/emxomf/emxomfld.c (modified) (1 diff, 1 prop)

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

@@ -164 +164 @@
 
 /* To avoid including os2.h... */
-#ifdef _System
-unsigned _System DosCopy (char *, char *, unsigned);
-#else
-unsigned DosCopy (char *, char *, unsigned);
+#ifndef _System
+#define _System
 #endif
-
+extern int _System DosCopy (char *, char *, int);
 
 /* Tell the user how to run this program. */