diff -Naur mozilla-1.9.2/config/pathsub.h mozilla-1.9.2.tpg/config/pathsub.h
--- mozilla-1.9.2/config/pathsub.h	2009-11-09 00:33:58.000000000 +0000
+++ mozilla-1.9.2.tpg/config/pathsub.h	2009-11-12 19:11:40.000000000 +0000
@@ -46,7 +46,7 @@
 #include <sys/types.h>
 
 #ifndef PATH_MAX
-#define PATH_MAX 1024
+#error  "PATH_MAX is not defined!"
 #endif
 
 /*
diff -Naur mozilla-1.9.2/dbm/include/mcom_db.h mozilla-1.9.2.tpg/dbm/include/mcom_db.h
--- mozilla-1.9.2/dbm/include/mcom_db.h	2009-11-09 00:34:00.000000000 +0000
+++ mozilla-1.9.2.tpg/dbm/include/mcom_db.h	2009-11-12 19:07:16.000000000 +0000
@@ -175,7 +175,8 @@
 #endif  /* __DBINTERFACE_PRIVATE */
 
 #ifdef SCO
-#define MAXPATHLEN 	1024              
+#include <limits.h>
+#define MAXPATHLEN 	PATH_MAX
 #endif
 
 #include <fcntl.h>
diff -Naur mozilla-1.9.2/modules/libjar/nsZipArchive.cpp mozilla-1.9.2.tpg/modules/libjar/nsZipArchive.cpp
--- mozilla-1.9.2/modules/libjar/nsZipArchive.cpp	2009-11-09 00:34:14.000000000 +0000
+++ mozilla-1.9.2.tpg/modules/libjar/nsZipArchive.cpp	2009-11-12 19:12:47.000000000 +0000
@@ -101,7 +101,7 @@
 #    define S_IFLNK  0120000
 #  endif
 #  ifndef PATH_MAX
-#    define PATH_MAX 1024
+#    include <limits.h>
 #  endif
 #endif  /* XP_UNIX */
 
diff -Naur mozilla-1.9.2/modules/libreg/src/reg.c mozilla-1.9.2.tpg/modules/libreg/src/reg.c
--- mozilla-1.9.2/modules/libreg/src/reg.c	2009-11-09 00:34:15.000000000 +0000
+++ mozilla-1.9.2.tpg/modules/libreg/src/reg.c	2009-11-12 19:10:40.000000000 +0000
@@ -94,7 +94,8 @@
 #ifdef PATH_MAX
 #define MAX_PATH PATH_MAX
 #else
-#define MAX_PATH 1024
+#include <limits.h>
+#define MAX_PATH PATH_MAX
 #endif
 #endif
 #elif defined(XP_OS2)
diff -Naur mozilla-1.9.2/nsprpub/config/pathsub.h mozilla-1.9.2.tpg/nsprpub/config/pathsub.h
--- mozilla-1.9.2/nsprpub/config/pathsub.h	2009-11-09 00:34:16.000000000 +0000
+++ mozilla-1.9.2.tpg/nsprpub/config/pathsub.h	2009-11-12 19:13:28.000000000 +0000
@@ -50,7 +50,7 @@
 #endif
 
 #ifndef PATH_MAX
-#define PATH_MAX 1024
+#error  "PATH_MAX is not defined!"
 #endif
 
 /*
diff -Naur mozilla-1.9.2/security/coreconf/nsinstall/pathsub.h mozilla-1.9.2.tpg/security/coreconf/nsinstall/pathsub.h
--- mozilla-1.9.2/security/coreconf/nsinstall/pathsub.h	2009-11-09 00:34:19.000000000 +0000
+++ mozilla-1.9.2.tpg/security/coreconf/nsinstall/pathsub.h	2009-11-12 19:13:54.000000000 +0000
@@ -49,7 +49,7 @@
 #endif
 
 #ifndef PATH_MAX
-#define PATH_MAX 1024
+#error  "PATH_MAX is not defined!"
 #endif
 
 /*
diff -Naur mozilla-1.9.2/toolkit/mozapps/update/src/updater/updater.cpp mozilla-1.9.2.tpg/toolkit/mozapps/update/src/updater/updater.cpp
--- mozilla-1.9.2/toolkit/mozapps/update/src/updater/updater.cpp	2009-11-09 00:34:23.000000000 +0000
+++ mozilla-1.9.2.tpg/toolkit/mozapps/update/src/updater/updater.cpp	2009-11-12 19:03:09.000000000 +0000
@@ -151,7 +151,8 @@
 # elif defined(CCHMAXPATH)
 #  define MAXPATHLEN CCHMAXPATH
 # else
-#  define MAXPATHLEN 1024
+#  include <limits.h>
+#  define MAXPATHLEN PATH_MAX
 # endif
 #endif
 
diff -Naur mozilla-1.9.2/toolkit/xre/nsAppRunner.h mozilla-1.9.2.tpg/toolkit/xre/nsAppRunner.h
--- mozilla-1.9.2/toolkit/xre/nsAppRunner.h	2009-11-09 00:34:23.000000000 +0000
+++ mozilla-1.9.2.tpg/toolkit/xre/nsAppRunner.h	2009-11-12 19:01:18.000000000 +0000
@@ -52,7 +52,8 @@
 #elif defined(CCHMAXPATH)
 #define MAXPATHLEN CCHMAXPATH
 #else
-#define MAXPATHLEN 1024
+#include <limits.h>
+#define MAXPATHLEN PATH_MAX
 #endif
 #endif
 
diff -Naur mozilla-1.9.2/widget/src/xremoteclient/XRemoteClient.cpp mozilla-1.9.2.tpg/widget/src/xremoteclient/XRemoteClient.cpp
--- mozilla-1.9.2/widget/src/xremoteclient/XRemoteClient.cpp	2009-11-09 00:34:24.000000000 +0000
+++ mozilla-1.9.2.tpg/widget/src/xremoteclient/XRemoteClient.cpp	2009-11-12 19:09:36.000000000 +0000
@@ -80,7 +80,8 @@
 #ifdef PATH_MAX
 #define MAX_PATH PATH_MAX
 #else
-#define MAX_PATH 1024
+#include <limits.h>
+#define MAX_PATH PATH_MAX
 #endif
 #endif
 
diff -Naur mozilla-1.9.2/xpcom/build/nsXPCOMPrivate.h mozilla-1.9.2.tpg/xpcom/build/nsXPCOMPrivate.h
--- mozilla-1.9.2/xpcom/build/nsXPCOMPrivate.h	2009-11-09 00:34:24.000000000 +0000
+++ mozilla-1.9.2.tpg/xpcom/build/nsXPCOMPrivate.h	2009-11-12 19:06:22.000000000 +0000
@@ -302,7 +302,8 @@
 #elif defined(CCHMAXPATH)
 #define MAXPATHLEN CCHMAXPATH
 #else
-#define MAXPATHLEN 1024
+#include <limits.h>
+#define MAXPATHLEN PATH_MAX
 #endif
 #endif
 
diff -Naur mozilla-1.9.2/xpcom/io/SpecialSystemDirectory.cpp mozilla-1.9.2.tpg/xpcom/io/SpecialSystemDirectory.cpp
--- mozilla-1.9.2/xpcom/io/SpecialSystemDirectory.cpp	2009-11-09 00:34:24.000000000 +0000
+++ mozilla-1.9.2.tpg/xpcom/io/SpecialSystemDirectory.cpp	2009-11-12 19:04:15.000000000 +0000
@@ -108,7 +108,8 @@
 #elif defined(CCHMAXPATH)
 #define MAXPATHLEN CCHMAXPATH
 #else
-#define MAXPATHLEN 1024
+#include <limits.h>
+#define MAXPATHLEN PATH_MAX
 #endif
 #endif
 
diff -Naur mozilla-1.9.2/xpcom/obsolete/nsFileSpecUnix.cpp mozilla-1.9.2.tpg/xpcom/obsolete/nsFileSpecUnix.cpp
--- mozilla-1.9.2/xpcom/obsolete/nsFileSpecUnix.cpp	2009-11-09 00:34:24.000000000 +0000
+++ mozilla-1.9.2.tpg/xpcom/obsolete/nsFileSpecUnix.cpp	2009-11-12 19:05:13.000000000 +0000
@@ -80,7 +80,8 @@
 #endif
 
 #ifndef MAXPATHLEN
-#define MAXPATHLEN	1024  /* Guessing this is okay.  Works for SCO. */
+#include <limits.h>
+#define MAXPATHLEN	PATH_MAX  /* Guessing this is okay.  Works for SCO. */
 #endif
  
 #if defined(__QNX__)
diff -Naur mozilla-1.9.2/xpcom/typelib/xpidl/xpidl_java.c mozilla-1.9.2.tpg/xpcom/typelib/xpidl/xpidl_java.c
--- mozilla-1.9.2/xpcom/typelib/xpidl/xpidl_java.c	2009-11-09 00:34:25.000000000 +0000
+++ mozilla-1.9.2.tpg/xpcom/typelib/xpidl/xpidl_java.c	2009-11-12 19:08:17.000000000 +0000
@@ -44,6 +44,7 @@
 #include "xpidl.h"
 #include <ctype.h>
 #include <glib.h>
+#include <limits.h>
 
 #ifdef XP_WIN
 #include <windef.h>