diff options
| author | Havoc Pennington <hp@redhat.com> | 2003-09-29 18:16:45 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@src.gnome.org> | 2003-09-29 18:16:45 +0000 |
| commit | a889ff346907763f3e2a284bcfb9b1f89f603ad1 (patch) | |
| tree | cd4abb359cc98885242cd5a045327a744291b084 | |
| parent | 320ef83bfcbfd0536bbf41df68e6a3ee0bf7bd2d (diff) | |
| download | metacity-a889ff346907763f3e2a284bcfb9b1f89f603ad1.tar.gz | |
fix the 64-bit check not to use macros from the X tree that don't get set
2003-09-29 Havoc Pennington <hp@redhat.com>
* src/xprops.c (cvtINT16toInt): fix the 64-bit check not to use
macros from the X tree that don't get set
* configure.in: check for sizes of various types
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | configure.in | 12 | ||||
| -rw-r--r-- | src/xprops.c | 4 |
3 files changed, 21 insertions, 2 deletions
@@ -1,5 +1,12 @@ 2003-09-29 Havoc Pennington <hp@redhat.com> + * src/xprops.c (cvtINT16toInt): fix the 64-bit check not to use + macros from the X tree that don't get set + + * configure.in: check for sizes of various types + +2003-09-29 Havoc Pennington <hp@redhat.com> + * src/delete.c (meta_window_delete): don't move the focus after you click the close button on a window. bug #108706 diff --git a/configure.in b/configure.in index cd50cc1a..fbe7ad1d 100644 --- a/configure.in +++ b/configure.in @@ -23,6 +23,18 @@ AC_HEADER_STDC AC_LIBTOOL_WIN32_DLL AM_PROG_LIBTOOL +#### Integer sizes + +AC_CHECK_SIZEOF(char) +AC_CHECK_SIZEOF(short) +AC_CHECK_SIZEOF(long) +AC_CHECK_SIZEOF(int) +AC_CHECK_SIZEOF(void *) +AC_CHECK_SIZEOF(long long) +AC_CHECK_SIZEOF(__int64) + +#### Warnings + changequote(,)dnl if test "x$GCC" = "xyes"; then case " $CFLAGS " in diff --git a/src/xprops.c b/src/xprops.c index d8859ab0..cc9bd97c 100644 --- a/src/xprops.c +++ b/src/xprops.c @@ -657,7 +657,7 @@ meta_prop_get_text_property (MetaDisplay *display, /* From Xmd.h */ #ifndef cvtINT32toInt -#if defined(WORD64) && defined(UNSIGNEDBITFIELDS) +#if SIZEOF_VOID_P == 8 #define cvtINT8toInt(val) (((val) & 0x00000080) ? ((val) | 0xffffffffffffff00) : (val)) #define cvtINT16toInt(val) (((val) & 0x00008000) ? ((val) | 0xffffffffffff0000) : (val)) #define cvtINT32toInt(val) (((val) & 0x80000000) ? ((val) | 0xffffffff00000000) : (val)) @@ -677,7 +677,7 @@ meta_prop_get_text_property (MetaDisplay *display, #define cvtINT8toLong(val) (val) #define cvtINT16toLong(val) (val) #define cvtINT32toLong(val) (val) -#endif /* WORD64 and UNSIGNEDBITFIELDS */ +#endif /* SIZEOF_VOID_P == 8 */ #endif /* cvtINT32toInt() */ static gboolean |