diff --git a/mozilla/config/nsinstall.c b/mozilla/config/nsinstall.c
index 08b95bb183f..6521a650bb5 100644
--- a/mozilla/config/nsinstall.c
+++ b/mozilla/config/nsinstall.c
@@ -64,7 +64,7 @@
 #include <bsd/libc.h>
 #endif
 
-#ifdef QNX
+#ifdef __QNX__
 #include <unix.h>
 #endif
 
diff --git a/mozilla/config/pathsub.c b/mozilla/config/pathsub.c
index c78e9d709ca..64d4796c702 100644
--- a/mozilla/config/pathsub.c
+++ b/mozilla/config/pathsub.c
@@ -49,7 +49,7 @@
 #include "sunos4.h"
 #endif
 
-#ifdef QNX
+#ifdef __QNX__
 #define D_INO	d_stat.st_ino
 #else
 #define D_INO	d_ino
diff --git a/mozilla/dbm/include/mcom_db.h b/mozilla/dbm/include/mcom_db.h
index 3f2d517c918..2625aa0b4d4 100644
--- a/mozilla/dbm/include/mcom_db.h
+++ b/mozilla/dbm/include/mcom_db.h
@@ -120,7 +120,7 @@
 #include <sys/endian.h>
 #endif
 
-#ifdef QNX
+#ifdef __QNX__
 #define LITTLE_ENDIAN	1234
 #define BIG_ENDIAN	4321
 #define BYTE_ORDER	LITTLE_ENDIAN
diff --git a/mozilla/dbm/src/hash.c b/mozilla/dbm/src/hash.c
index 2eb1c7e63f9..10001a39a8f 100644
--- a/mozilla/dbm/src/hash.c
+++ b/mozilla/dbm/src/hash.c
@@ -412,7 +412,7 @@ init_hash(HTAB *hashp, const char *file, HASHINFO *info)
 			return (NULL);
 
 #if !defined(_WIN32) && !defined(_WINDOWS) && !defined(macintosh)
-#ifdef QNX
+#ifdef __QNX__
 		hashp->BSIZE = statbuf.st_size;
 #else
 		hashp->BSIZE = statbuf.st_blksize;
diff --git a/mozilla/include/xp_mcom.h b/mozilla/include/xp_mcom.h
index 4010944f1c2..d36390a990f 100644
--- a/mozilla/include/xp_mcom.h
+++ b/mozilla/include/xp_mcom.h
@@ -93,7 +93,7 @@ extern char * strdup (const char * s);
 XP_END_PROTOS
 #endif
 
-#ifndef QNX
+#ifndef __QNX__
 #include <memory.h>
 #endif
 
diff --git a/mozilla/js/src/jscpucfg.c b/mozilla/js/src/jscpucfg.c
index 02925258625..4b4ed29bd78 100644
--- a/mozilla/js/src/jscpucfg.c
+++ b/mozilla/js/src/jscpucfg.c
@@ -39,7 +39,7 @@
 #define INT64	long
 #endif
 #else
-#if defined(HPUX) || defined(QNX) || defined(SCO) || defined(UNIXWARE)
+#if defined(HPUX) || defined(__QNX__) || defined(SCO) || defined(UNIXWARE)
 #define INT64	long
 #else
 #define INT64	long long