OS/2 build patches

SVN revision: 846

epp/cppexp.c

@@ -27,6 +27,10 @@
 #include "config.h"
 #include "header.h"
 
+#ifdef __EMX__
+#include <strings.h>
+#endif
+
 #ifdef MULTIBYTE_CHARS
 #include <locale.h>
 #endif

epp/cpplib.c

@@ -26,6 +26,10 @@ char               *version_string = "0.0.0";
 
 #include "econfig.h"
 
+#ifdef __EMX__
+#include <strings.h>
+#endif
+
 #ifndef STANDARD_INCLUDE_DIR
 #define STANDARD_INCLUDE_DIR "/usr/include"
 #endif
@@ -3439,7 +3443,11 @@ do_include(pfile, keyword, unused1, unused2)
 
    /* If specified file name is absolute, just open it.  */
 
-   if (*fbeg == '/')
+#ifndef __EMX__
+    if (*fbeg == '/')
+#else
+    if (_fnisabs(fbeg))
+#endif
      {
 	strncpy(fname, fbeg, flen);
 	fname[flen] = 0;
@@ -5584,7 +5592,11 @@ read_name_map(pfile, dirname)
    if (*dirname)
       strcat(name, "/");
    strcat(name, FILE_NAME_MAP_FILE);
-   f = fopen(name, "r");
+#ifndef __EMX__
+      f = fopen(name, "r");
+#else
+      f = fopen(name, "rt");
+#endif
    if (!f)
       map_list_ptr->map_list_map = NULL;
    else

epp/cpplib.h

@@ -634,6 +634,10 @@ extern cpp_buffer* cpp_pop_buffer PARAMS ((cpp_reader *));
 extern cpp_hashnode* cpp_lookup PARAMS ((cpp_reader*, const U_CHAR*,
 					 int, int));
 
+#ifdef __EMX__
+#define PATH_SEPARATOR ';'
+#endif
+
 #ifdef __cplusplus
 }
 #endif

epp/cppmain.c

@@ -51,7 +51,11 @@ main(argc, argv)
    struct cpp_options *opts = &options;
 
    p = argv[0] + strlen(argv[0]);
+#ifndef __EMX__
    while (p != argv[0] && p[-1] != '/')
+#else
+   while (p != argv[0] && p[-1] != '/' && p[-1] != '\\')
+#endif
       --p;
    progname = p;