rs=leaf

Remove XP_OS2_VACPP from the tree

config/pathsub.c

@@ -48,9 +48,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#if !defined(XP_OS2_VACPP)
 #include <unistd.h>
-#endif
 #include <sys/stat.h>
 #include "pathsub.h"
 
@@ -58,13 +56,6 @@
 #include <libc_r.h>
 #endif
 
-#if defined(XP_OS2_VACPP)
-#include <direct.h>
-#include <io.h>
-#include <sys/utime.h>
-#include <sys/types.h>
-#endif
-
 #ifdef SUNOS4
 #include "sunos4.h"
 #endif

intl/build/Makefile.in

@@ -89,9 +89,5 @@ EXTRA_DSO_LDOPTS += \
         $(NULL)
 endif
 
-ifeq ($(MOZ_OS2_TOOLS),VACPP)
-OS_LIBS += libuls.lib
-endif
-
 include $(topsrcdir)/config/rules.mk
 

intl/locale/src/os2/Makefile.in

@@ -43,11 +43,7 @@ CPPSRCS		= \
 		$(NULL)
 
 
-ifeq ($(MOZ_OS2_TOOLS),VACPP)
-OS_LIBS += libuls.lib
-else
 OS_LIBS += -llibuni
-endif
 
 include $(topsrcdir)/config/rules.mk
 

js/src/xpconnect/src/xpcprivate.h

@@ -183,13 +183,6 @@ void DEBUG_CheckWrapperThreadSafety(const XPCWrappedNative* wrapper);
 #undef GetClassInfo
 #endif
 
-// To kill #define index(a,b) strchr(a,b) macro in Toolkit types.h
-#ifdef XP_OS2_VACPP
-#ifdef index
-#undef index
-#endif
-#endif
-
 /***************************************************************************/
 // default initial sizes for maps (hashtables)
 

netwerk/test/TestOverlappedIO.cpp

@@ -265,11 +265,7 @@ main(int argc, char* argv[])
 {
     nsresult rv;
 
-#ifdef XP_OS2_VACPP
-    signal(SIGSEGV, (_SigFunc)sighandler);
-#else
     signal(SIGSEGV, sighandler);
-#endif
 
 #if defined(PR_LOGGING)
     gTestSocketIOLog = PR_NewLogModule("TestSocketIO");

netwerk/test/TestSocketIO.cpp

@@ -260,11 +260,7 @@ main(int argc, char* argv[])
 {
     nsresult rv;
 
-#ifdef XP_OS2_VACPP
-    signal(SIGSEGV, (_SigFunc)sighandler);
-#else
     signal(SIGSEGV, sighandler);
-#endif
 
 #if defined(PR_LOGGING)
     gTestSocketIOLog = PR_NewLogModule("TestSocketIO");

xpcom/base/nsDebugImpl.cpp

@@ -57,7 +57,7 @@
 
 #if defined(XP_OS2)
   /* Added definitions for DebugBreak() for 2 different OS/2 compilers.  Doing
-   * the int3 on purpose for Visual Age so that a developer can step over the
+   * the int3 on purpose so that a developer can step over the
    * instruction if so desired.  Not always possible if trapping due to exception
    * handling IBM-AKR
    */
@@ -66,12 +66,7 @@
   #include <string.h>
   
   #if defined(DEBUG)
-   #if defined(XP_OS2_VACPP)
-    #include <builtin.h>
-    #define DebugBreak() { _interrupt(3); }
-   #else
     #define DebugBreak() { asm("int $3"); }
-   #endif
   #else
     #define DebugBreak()
   #endif /* DEBUG */

xpcom/build/Makefile.in

@@ -104,10 +104,6 @@ FORCE_USE_PIC	= 1
 
 FORCE_SHARED_LIB = 1
 
-ifeq ($(MOZ_OS2_TOOLS),VACPP)
-OS_LIBS += libconv.lib libuls.lib
-endif
-
 ifeq ($(MOZ_OS2_TOOLS),EMX)
 OS_LIBS += -luconv
 endif

xpcom/glue/nsCOMPtr.h

@@ -196,7 +196,7 @@ class nsDerivedSafe : public T
       nsrefcnt Release(void);
 #endif
 
-#if !defined(XP_OS2_VACPP) && !defined(AIX) && !defined(IRIX)
+#if !defined(AIX) && !defined(IRIX)
       void operator delete( void*, size_t );                  // NOT TO BE IMPLEMENTED
         // declaring |operator delete| private makes calling delete on an interface pointer a compile error
 #endif

xpcom/io/nsLocalFileOS2.cpp

@@ -52,11 +52,7 @@ static nsresult PR_CALLBACK
 CreateDirectoryA( PSZ path, PEAOP2 ppEABuf);
 static int isleadbyte(int c);
 
-#ifdef XP_OS2_VACPP
-#include <direct.h>
-#else
 #include <unistd.h>
-#endif
 #include <io.h>
 
 
@@ -857,11 +853,7 @@ nsLocalFile::Remove(PRBool recursive)
                 iterator->HasMoreElements(&more);
             }
         }
-#ifdef XP_OS2_VACPP
-        rv = rmdir((char *) filePath) == -1 ? NSRESULT_FOR_ERRNO() : NS_OK;
-#else
         rv = rmdir(filePath) == -1 ? NSRESULT_FOR_ERRNO() : NS_OK;
-#endif
     }
     else
     {

xpcom/io/nsLocalFileOS2.h

@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+V/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  * The contents of this file are subject to the Netscape Public
  * License Version 1.1 (the "License"); you may not use this file
@@ -51,10 +51,6 @@
 
 #include <os2.h>
 
-#ifdef XP_OS2_VACPP
-#define ENOTDIR EBADPOS
-#endif
-
 class NS_COM nsLocalFile : public nsILocalFile
 {
 public:

xpcom/io/nsUnicharInputStream.cpp

@@ -44,7 +44,7 @@
 #include "nsCRT.h"
 #include "nsUTF8Utils.h"
 #include <fcntl.h>
-#if defined(NS_WIN32) || defined(XP_OS2_VACPP)
+#if defined(NS_WIN32)
 #include <io.h>
 #else
 #include <unistd.h>

xpinstall/packager/Makefile.in

@@ -53,10 +53,6 @@ endif
 MAKE_PACKAGE	= echo "Sorry, don't know how to build a $(MOZ_PKG_FORMAT) file yet...."
 MAKE_SDK	=
 
-ifeq ($(MOZ_OS2_TOOLS),VACPP)
-TARGET_OS = os2-vacpp
-endif
-
 PKG_BASENAME	:= $(MOZ_PKG_APPNAME)-$(TARGET_CPU)-$(TARGET_VENDOR)-$(TARGET_OS)
 PACKAGE		= $(PKG_BASENAME)$(PKG_SUFFIX)
 
@@ -204,10 +200,6 @@ ifndef EXCLUDE_NSPR_LIBS
 	@chmod 755 $(DIST)/$(MOZ_PKG_APPNAME)/*$(DLL_SUFFIX)
 endif
 endif
-ifeq ($(MOZ_OS2_TOOLS),VACPP)
-# Copy the C runtime
-	@cp -p $(VACPP365)/runtime/cpprmi36.dll $(DIST)/$(MOZ_PKG_APPNAME)
-endif
 endif # DMG
 	@echo "Stripping package directory..."
 	@cd $(DIST)/$(MOZ_PKG_APPNAME); find . ! -type d \

xpinstall/packager/os2/makexpi.pl

@@ -72,8 +72,6 @@ sub RecursiveModify
             {
                 # Make sure it is not read only
                 system("chmod 755 $entry");
-                # DLLRNAME it
-                system("dllrname $entry CPPRMI36=MOZRMI36");
             }
         }
 
@@ -104,15 +102,6 @@ if(!(-e "$inStagePath\\$inComponentName"))
   die "invalid path: $inStagePath\\$inComponentName\n";
 }
 
-if($inComponentName =~ /xpcom/i)
-{
-  # copy cpprmi36.dll to xpcom dir
-  if(-e "$ENV{VACPP365}\\runtime\\cpprmi36.dll")
-  {
-    system("cp $ENV{VACPP365}\\runtime\\cpprmi36.dll $inStagePath\\$inComponentName\\bin");
-  }
-}
-
 # check for existance of .js script
 if(!(-e "$inComponentName.js"))
 {

xpinstall/packager/os2/strip.cmd

@@ -1,3 +1,2 @@
 chmod 777 %1
-dllrname %1 cpprmi36=mozrmi36
 REM lxlite %1

xpinstall/wizard/os2/nsinstall/Makefile.in

@@ -44,11 +44,7 @@ NO_DIST_INSTALL	= 1
 include $(topsrcdir)/config/rules.mk
 
 
-ifeq ($(MOZ_OS2_TOOLS),VACPP)
-LDFLAGS += /PM:PM
-else
 LDFLAGS += -Zlinker /PM:PM
-endif
 
 libs:: $(PROGRAM)
 	$(INSTALL) $(PROGRAM) $(DIST)/install

xpinstall/wizard/os2/setup/Makefile.in

@@ -67,11 +67,7 @@ NO_DIST_INSTALL	= 1
 
 include $(topsrcdir)/config/rules.mk
 
-ifeq ($(MOZ_OS2_TOOLS),VACPP)
-LDFLAGS += /PM:PM
-else
 LDFLAGS += -Zlinker /PM:PM
-endif
 
 libs:: $(PROGRAM)
 	$(INSTALL) $(PROGRAM) $(DIST)/install

xpinstall/wizard/os2/setup/setup.h

@@ -43,9 +43,6 @@ typedef int PRInt32;
 #include <stdlib.h>
 #include <stdio.h>
 #include <assert.h>
-#ifdef XP_OS2_VACPP
-#include <direct.h>
-#endif
 #include <ctype.h>
 #include "setuprsc.h"
 #include "resource.h"

xpinstall/wizard/os2/uninstall/Makefile.in

@@ -54,11 +54,7 @@ NO_DIST_INSTALL	= 1
 
 include $(topsrcdir)/config/rules.mk
 
-ifeq ($(MOZ_OS2_TOOLS),VACPP)
-LDFLAGS += /PM:PM
-else
 LDFLAGS += -Zlinker /PM:PM
-endif
 
 libs:: $(PROGRAM)
 	$(INSTALL) $(PROGRAM) $(DIST)/install