rs=leaf

Remove XP_OS2_VACPP from the tree

modules/libjar/zipstub.h

@@ -60,7 +60,7 @@
 #if defined(XP_MAC)
 #define PR_EXTERN(__type)       extern __declspec(export) __type
 #define PR_PUBLIC_API(__type)   __declspec(export) __type
-#elif defined(XP_WIN) || defined(XP_OS2_VACPP)
+#elif defined(XP_WIN)
 #define PR_EXTERN(__type)       extern _declspec(dllexport) __type
 #define PR_PUBLIC_API(__type)   _declspec(dllexport) __type
 #else /* XP_UNIX */
@@ -68,14 +68,8 @@
 #define PR_PUBLIC_API(__type)   __type 
 #endif
 
-#ifdef XP_OS2_VACPP
-#define PR_CALLBACK _Optlink
-#define PR_STATIC_CALLBACK(__x) static __x PR_CALLBACK
-#else
 #define PR_CALLBACK
 #define PR_STATIC_CALLBACK(__x) static __x
-#endif
-
 
 #define NS_STATIC_CAST(__type, __ptr)      ((__type)(__ptr))
 

modules/libreg/src/reg.c

@@ -451,9 +451,7 @@ static REGERR nr_OpenFile(char *path, FILEHANDLE *fh)
 #if defined(XP_MAC) || defined(XP_MACOSX)
         case opWrErr:
 #else
-#ifndef XP_OS2_VACPP
         case EROFS:     /* read-only file system */
-#endif
         case EACCES:    /* file in use or read-only file*/
 #endif
             /* try read only */

modules/libreg/src/vr_stubs.h

@@ -57,10 +57,6 @@
 #include <sys/stat.h>
 #endif
 
-#ifdef XP_OS2_VACPP
-#include <direct.h>
-#endif
-
 #ifndef FALSE
 #define FALSE 0
 #endif