2005-01-27 Havoc Pennington <hp@redhat.com>

[platform/upstream/dbus.git] / dbus / dbus-internals.h

diff --git a/dbus/dbus-internals.h b/dbus/dbus-internals.h
index 2ffd234..3f0a34f 100644 (file)
--- a/dbus/dbus-internals.h
+++ b/dbus/dbus-internals.h
@@ -183,11 +183,18 @@ dbus_bool_t _dbus_string_array_contains (const char **array,
                                          const char  *str);
 char**      _dbus_dup_string_array      (const char **array);
 
-#define _DBUS_INT_MIN   (-_DBUS_INT_MAX - 1)
-#define _DBUS_INT_MAX   2147483647
-#define _DBUS_UINT_MAX  0xffffffff
+#define _DBUS_INT16_MIN         ((dbus_int16_t) 0x8000)
+#define _DBUS_INT16_MAX         ((dbus_int16_t) 0x7fff)
+#define _DBUS_UINT16_MAX ((dbus_uint16_t)0xffff)
+#define _DBUS_INT32_MIN         ((dbus_int32_t) 0x80000000)
+#define _DBUS_INT32_MAX         ((dbus_int32_t) 0x7fffffff)
+#define _DBUS_UINT32_MAX ((dbus_uint32_t)0xffffffff)
+/* using 32-bit here is sort of bogus */
+#define _DBUS_INT_MIN   _DBUS_INT32_MIN
+#define _DBUS_INT_MAX   _DBUS_INT32_MAX
+#define _DBUS_UINT_MAX  _DBUS_UINT32_MAX
 #ifdef DBUS_HAVE_INT64
-#define _DBUS_INT64_MAX         DBUS_INT64_CONSTANT (9223372036854775807)
+#define _DBUS_INT64_MAX         DBUS_INT64_CONSTANT  (0x7fffffffffffffff)
 #define _DBUS_UINT64_MAX DBUS_UINT64_CONSTANT (0xffffffffffffffff)
 #endif
 #define _DBUS_ONE_KILOBYTE 1024