* Merge in cygwin-64bit-branch.

1 files changed, 17 insertions, 11 deletions

diff --git a/winsup/cygwin/include/limits.h b/winsup/cygwin/include/limits.h
index 20723ab1d..e093d283d 100644
--- a/winsup/cygwin/include/limits.h
+++ b/winsup/cygwin/include/limits.h
@@ -1,7 +1,7 @@
 /* limits.h
 
    Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-   2011, 2012 Red Hat, Inc.
+   2011, 2012, 2013 Red Hat, Inc.
 
 This file is part of Cygwin.
 
@@ -12,6 +12,7 @@ details. */
 #ifndef _LIMITS_H___
 
 #include <features.h>
+#include <bits/wordsize.h>
 
 #ifndef _MACH_MACHLIMITS_H_
 
@@ -24,15 +25,15 @@ details. */
 
 /* Number of bits in a `char'.  */
 #undef CHAR_BIT
-#define CHAR_BIT 8
+#define CHAR_BIT __CHAR_BIT__
 
 /* Number of bits in a `long'.  */
 #undef LONG_BIT
-#define LONG_BIT 32
+#define LONG_BIT (__SIZEOF_LONG__ * __CHAR_BIT__)
 
 /* Number of bits in a `int'.  */
 #undef WORD_BIT
-#define WORD_BIT 32
+#define WORD_BIT (__SIZEOF_INT__ * __CHAR_BIT__)
 
 /* Maximum length of a multibyte character.  */
 #ifndef MB_LEN_MAX
@@ -89,14 +90,14 @@ details. */
 /* Minimum and maximum values a `signed long int' can hold.
    (Same as `int').  */
 #ifndef __LONG_MAX__
-#ifndef __alpha__
-#define __LONG_MAX__ 2147483647L
-#else
+#if __WORDSIZE == 64
 #define __LONG_MAX__ 9223372036854775807L
+#else
+#define __LONG_MAX__ 2147483647L
 # endif /* __alpha__ */
 #endif
 #undef LONG_MIN
-#define LONG_MIN (-LONG_MAX-1)
+#define LONG_MIN (-LONG_MAX-1L)
 #undef LONG_MAX
 #define LONG_MAX __LONG_MAX__
 
@@ -221,9 +222,9 @@ details. */
 #define PTHREAD_DESTRUCTOR_ITERATIONS 1
 
 /* Maximum number of data keys that can be created by a process. */
-/* Tls has 64 items for pre win2000 - and we don't want to use them all :] */
+/* Tls has 1088 items - and we don't want to use them all :] */
 #undef PTHREAD_KEYS_MAX
-#define PTHREAD_KEYS_MAX 32
+#define PTHREAD_KEYS_MAX 1024
 
 /* Minimum size in bytes of thread stack storage. */
 /* Actually the minimum stack size is somewhat of a split personality.
@@ -242,9 +243,14 @@ details. */
 /* #define PTHREAD_THREADS_MAX unspecified */
 
 /* Maximum number of realtime signals reserved for application use. */
-/* FIXME: We only support one realtime signal but _POSIX_RTSIG_MAX is 8. */
+/* FIXME: We only support one realtime signal in 32 bit mode, but
+	 _POSIX_RTSIG_MAX is 8. */
 #undef RTSIG_MAX
+#if __WORDSIZE == 64
+#define RTSIG_MAX 33
+#else
 #define RTSIG_MAX 1
+#endif
 
 /* Maximum number of semaphores that a process may have. */
 /* Windows allows any arbitrary number of semaphores per process. */