isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-25 09:30:45 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix the 64-bit check not to use macros from the X tree that don't get set

Browse Source 
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
This commit is contained in:
Havoc Pennington 2003-09-29 18:16:45 +00:00 committed by Havoc Pennington
parent 320ef83bfc
commit a889ff3469
3 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
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> 2003-09-29 Havoc Pennington <hp@redhat.com>
* src/delete.c (meta_window_delete): don't move the focus after * src/delete.c (meta_window_delete): don't move the focus after

12
configure.in
View File

@ -23,6 +23,18 @@ AC_HEADER_STDC
AC_LIBTOOL_WIN32_DLL AC_LIBTOOL_WIN32_DLL
AM_PROG_LIBTOOL 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 changequote(,)dnl
if test "x$GCC" = "xyes"; then if test "x$GCC" = "xyes"; then
case " $CFLAGS " in case " $CFLAGS " in

4
src/xprops.c
View File

@ -657,7 +657,7 @@ meta_prop_get_text_property (MetaDisplay *display,
/* From Xmd.h */ /* From Xmd.h */
#ifndef cvtINT32toInt #ifndef cvtINT32toInt
#if defined(WORD64) && defined(UNSIGNEDBITFIELDS) #if SIZEOF_VOID_P == 8
#define cvtINT8toInt(val) (((val) & 0x00000080) ? ((val) | 0xffffffffffffff00) : (val)) #define cvtINT8toInt(val) (((val) & 0x00000080) ? ((val) | 0xffffffffffffff00) : (val))
#define cvtINT16toInt(val) (((val) & 0x00008000) ? ((val) | 0xffffffffffff0000) : (val)) #define cvtINT16toInt(val) (((val) & 0x00008000) ? ((val) | 0xffffffffffff0000) : (val))
#define cvtINT32toInt(val) (((val) & 0x80000000) ? ((val) | 0xffffffff00000000) : (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 cvtINT8toLong(val) (val)
#define cvtINT16toLong(val) (val) #define cvtINT16toLong(val) (val)
#define cvtINT32toLong(val) (val) #define cvtINT32toLong(val) (val)
#endif /* WORD64 and UNSIGNEDBITFIELDS */ #endif /* SIZEOF_VOID_P == 8 */
#endif /* cvtINT32toInt() */ #endif /* cvtINT32toInt() */
static gboolean static gboolean