Bug 438331 - Remove WIN16 (support) code everywhere; (Av1) </xpcom/*>; r+sr=benjamin
authorSerge Gautherie <sgautherie.bz@free.fr>
Wed, 08 Oct 2008 02:21:13 +0200
changeset 20118 4c7ccb9f3e70e57dc8b9c122c55ca46ffd378ca5
parent 20117 7356c512e9e157f269c4f7b1871983c6541104f1
child 20119 bfb00692bddcf733c89889f9003c7aeee562690d
push idunknown
push userunknown
push dateunknown
bugs438331
milestone1.9.1b2pre
Bug 438331 - Remove WIN16 (support) code everywhere; (Av1) </xpcom/*>; r+sr=benjamin
config/system-headers
xpcom/build/xpcom.pkg
xpcom/io/nsAppFileLocationProvider.cpp
xpcom/io/nsIStreamBufferAccess.idl
--- a/config/system-headers
+++ b/config/system-headers
@@ -991,17 +991,16 @@ prshm.h
 prshma.h
 prsystem.h
 prthread.h
 prtime.h
 prtpool.h
 prtrace.h
 prtypes.h
 prvrsion.h
-prwin16.h
 plbase64.h
 plerror.h
 plgetopt.h
 plresolv.h
 plstr.h
 plarenas.h
 plarena.h
 plhash.h
--- a/xpcom/build/xpcom.pkg
+++ b/xpcom/build/xpcom.pkg
@@ -82,17 +82,16 @@ dist/include/nspr/prshma.h
 dist/include/nspr/prshm.h
 dist/include/nspr/prsystem.h
 dist/include/nspr/prthread.h
 dist/include/nspr/prtime.h
 dist/include/nspr/prtpool.h
 dist/include/nspr/prtrace.h
 dist/include/nspr/prtypes.h
 dist/include/nspr/prvrsion.h
-dist/include/nspr/prwin16.h
 dist/include/nspr/plarenas.h
 dist/include/nspr/plarena.h
 dist/include/nspr/plhash.h
 dist/include/nspr/plbase64.h
 dist/include/nspr/plerror.h
 dist/include/nspr/plgetopt.h
 dist/include/nspr/plresolv.h
 dist/include/nspr/plstr.h
--- a/xpcom/io/nsAppFileLocationProvider.cpp
+++ b/xpcom/io/nsAppFileLocationProvider.cpp
@@ -509,17 +509,17 @@ class nsAppDirectoryEnumerator : public 
     nsCOMPtr<nsIFile> mNext;
 };
 
 NS_IMPL_ISUPPORTS1(nsAppDirectoryEnumerator, nsISimpleEnumerator)
 
 /* nsPathsDirectoryEnumerator and PATH_SEPARATOR
  * are not used on MacOS/X. */
 
-#if defined(XP_WIN) || defined(XP_OS2)/* Win32, Win16, and OS/2 */
+#if defined(XP_WIN) || defined(XP_OS2) /* Win32 and OS/2 */
 #define PATH_SEPARATOR ';'
 #else /*if defined(XP_UNIX) || defined(XP_BEOS)*/
 #define PATH_SEPARATOR ':'
 #endif
 
 class nsPathsDirectoryEnumerator : public nsAppDirectoryEnumerator
 {
   public:
--- a/xpcom/io/nsIStreamBufferAccess.idl
+++ b/xpcom/io/nsIStreamBufferAccess.idl
@@ -124,17 +124,17 @@ interface nsIStreamBufferAccess : nsISup
 // XXX What if we have a compiler that follows aliasing rules strictly but
 // doesn't have a 64-bit int type?
 //
 // XXXbe shouldn't NSPR's LL_INIT work for non-constant arguments in all cases?
 
 # if defined HAVE_LONG_LONG
 #  if PR_BYTES_PER_LONG == 8
 #   define ULL_(x)     x ## UL
-#  elif (defined WIN32 || defined WIN16) && !defined __GNUC__
+#  elif defined WIN32 && !defined __GNUC__
 #   define ULL_(x)     ((uint64) x ## i64)
 #  else
 #   define ULL_(x)     x ## ULL
 #  endif
 
 #  define NS_SWAP64(x) ((((x)    & ULL_(0xff00000000000000))    >> 56) |      \
                         (((x)    & ULL_(0x00ff000000000000))    >> 40) |      \
                         (((x)    & ULL_(0x0000ff0000000000))    >> 24) |      \