Bug#749120: [PATCH libFS] include X11/Xmd.h in fs_transport
On 07/26/15 11:16 AM, Julien Cristau wrote: Xtrans defines BytesReadable_t as int or long depending on whether LONG64 is defined. So on a 64bit build it would be int when building FSConnServ.c, but long for fs_transport.c. To fix this inconsistency, make fs_transport.c include X11/Xmd.h. Debian bug#749120 Reported-by: Michael Tautschnig m...@debian.org Signed-off-by: Julien Cristau jcris...@debian.org --- src/fs_transport.c | 1 + 1 file changed, 1 insertion(+) I'm not sure if this should be fixed in xtrans instead... Yeah - I think we should add the #include X11/Xmd.h to Xtrans.h, not force every consumer to add it before including Xtrans.h. -- -Alan Coopersmith- alan.coopersm...@oracle.com Oracle Solaris Engineering - http://blogs.oracle.com/alanc -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: https://lists.debian.org/55b52dab.6090...@oracle.com
Bug#749120: [PATCH libFS] include X11/Xmd.h in fs_transport
Xtrans defines BytesReadable_t as int or long depending on whether LONG64 is defined. So on a 64bit build it would be int when building FSConnServ.c, but long for fs_transport.c. To fix this inconsistency, make fs_transport.c include X11/Xmd.h. Debian bug#749120 Reported-by: Michael Tautschnig m...@debian.org Signed-off-by: Julien Cristau jcris...@debian.org --- src/fs_transport.c | 1 + 1 file changed, 1 insertion(+) I'm not sure if this should be fixed in xtrans instead... diff --git a/src/fs_transport.c b/src/fs_transport.c index a924f91..347bd43 100644 --- a/src/fs_transport.c +++ b/src/fs_transport.c @@ -28,4 +28,5 @@ #endif #include config.h /* Need to know which transport types to support */ +#include X11/Xmd.h #include X11/Xtrans/transport.c -- 2.1.4 -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: https://lists.debian.org/1437934619-21475-1-git-send-email-jcris...@debian.org
Bug#695064: marked as done (conflicting declaration ‘typedef CARD8 BOOL’ in xmd.h)
Your message dated Thu, 6 Dec 2012 12:05:10 +0100 with message-id 20121206110510.gr5...@radis.cristau.org and subject line Re: Bug#695064: conflicting declaration ‘typedef CARD8 BOOL’ in xmd.h has caused the Debian Bug report #695064, regarding conflicting declaration ‘typedef CARD8 BOOL’ in xmd.h to be marked as done. This means that you claim that the problem has been dealt with. If this is not the case it is now your responsibility to reopen the Bug report if necessary, and/or fix the problem forthwith. (NB: If you are a system administrator and have no idea what this message is talking about, this may indicate a serious mail system misconfiguration somewhere. Please contact ow...@bugs.debian.org immediately.) -- 695064: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=695064 Debian Bug Tracking System Contact ow...@bugs.debian.org with problems ---BeginMessage--- Package: libx11-dev:amd64 Version: 2:1.5.0-1 Hi, I'm building a c++ application, which includes xf86vmode.h header. I think this is part of the X11 library header files. Here is the dpkg output: jarrett@debian:~/$ dpkg --list libx11-dev Desired=Unknown/Install/Remove/Purge/Hold | Status=Not/Inst/Conf-files/Unpacked/halF-conf/Half-inst/trig-aWait/Trig-pend |/ Err?=(none)/Reinst-required (Status,Err: uppercase=bad) ||/ NameVersionArchitecture Description +++-===-==-==- ii libx11-dev:amd642:1.5.0-1 amd64 X11 client-side library (development headers) When I compile with the g++ flag '-std=gnu++0x', I get the following error: In file included from /usr/include/X11/extensions/xf86vmode.h:37:0, from src/engine/../linux/LinuxGLWindow.h:31, from src/engine/../linux/Common.h:11, from src/engine/IceGraphicsEngine.h:27, from src/engine/IceGraphicsEngine.cpp:8: /usr/include/X11/Xmd.h:143:16: error: conflicting declaration ‘typedef CARD8 BOOL’ My guess is the new c++ features has a conflict or something here... If I remove line 143 from Xmd.h, I no longer see this error. Cheers Jarrett PS: the reportbug application crashed (I was using the gtk version) with this error: jarrett@debian:~$ reportbug *** glibc detected *** ** Gdk:ERROR:/tmp/buildd/gtk+2.0-2.24.10/gdk/gdkregion-generic.c:1110:miUnionNonO: assertion failed: (y1 y2) Aborted ---End Message--- ---BeginMessage--- On Wed, Dec 5, 2012 at 20:10:37 -0500, Jarrett Chisholm wrote: Hi Julien, thanks for getting back to me about this issue! I believe it is conflicting with FreeImage.hhere's the full stack trace: Right, so it's nothing to do with c++. I don't think there's much we can do here, sorry. Cheers, Julien signature.asc Description: Digital signature ---End Message---
Bug#695064: conflicting declaration ‘typedef CARD8 BOOL’ in xmd.h
Hi Julien, thanks for getting back to me about this issue! I believe it is conflicting with FreeImage.hhere's the full stack trace: jarrett@debian:~/projects/chisholmsoft/dark_horizon$ bash compile_and_run.sh scons: Reading SConscript files ... scons: done reading SConscript files. scons: Building targets ... g++ -o build/Test.o -c -std=gnu++0x -I../lwis/src/engine src/Test.cpp In file included from ../lwis/src/engine/IInputManager.h:11:0, from ../lwis/src/engine/InputFactory.h:11, from ../lwis/src/engine/LWISCommon.h:13, from src/Test.h:14, from src/Test.cpp:8: ../lwis/src/engine/IKeyboardDevice.h:319:36: warning: multi-character character constant [-Wmultichar] ../lwis/src/engine/IKeyboardDevice.h:339:35: warning: multi-character character constant [-Wmultichar] In file included from ../lwis/src/engine/IInputManager.h:11:0, from ../lwis/src/engine/InputFactory.h:11, from ../lwis/src/engine/LWISCommon.h:13, from src/Test.h:14, from src/Test.cpp:8: ../lwis/src/engine/IKeyboardDevice.h: In constructor ‘lwis::engine::IKeyboardDevice::IKeyboardDevice()’: ../lwis/src/engine/IKeyboardDevice.h:319:36: warning: overflow in implicit constant conversion [-Woverflow] ../lwis/src/engine/IKeyboardDevice.h:339:35: warning: overflow in implicit constant conversion [-Woverflow] g++ -o build/engine/IceGraphicsEngine.o -c -std=gnu++0x -I../lwis/src/engine src/engine/IceGraphicsEngine.cpp In file included from /usr/include/X11/extensions/xf86vmode.h:37:0, from src/engine/../linux/LinuxGLWindow.h:31, from src/engine/../linux/Common.h:11, from src/engine/IceGraphicsEngine.h:27, from src/engine/IceGraphicsEngine.cpp:8: /usr/include/X11/Xmd.h:143:16: error: conflicting declaration ‘typedef CARD8 BOOL’ In file included from src/engine/../linux/../engine/../common/utilities/ImageLoader.h:15:0, from src/engine/../linux/../engine/Texture.h:11, from src/engine/../linux/../engine/TextureManager.h:20, from src/engine/../linux/LinuxGLWindow.h:15, from src/engine/../linux/Common.h:11, from src/engine/IceGraphicsEngine.h:27, from src/engine/IceGraphicsEngine.cpp:8: /usr/include/FreeImage.h:139:17: error: ‘BOOL’ has a previous declaration as ‘typedef int32_t BOOL’ scons: *** [build/engine/IceGraphicsEngine.o] Error 1 scons: building terminated because of errors. Script halted due to error(s)! cheers jarrett On 03/12/12 04:25 PM, Julien Cristau wrote: Control: reassign -1 x11proto-core-dev Control: tag -1 moreinfo On Mon, Dec 3, 2012 at 13:24:55 -0500, Jarrett Chisholm wrote: I'm building a c++ application, which includes xf86vmode.h header. I think this is part of the X11 library header files. Here is the dpkg output: Xmd.h is not, but close enough. It's part of the X11 protocol headers. jarrett@debian:~/$ dpkg --list libx11-dev Desired=Unknown/Install/Remove/Purge/Hold | Status=Not/Inst/Conf-files/Unpacked/halF-conf/Half-inst/trig-aWait/Trig-pend |/ Err?=(none)/Reinst-required (Status,Err: uppercase=bad) ||/ NameVersionArchitecture Description +++-===-==-==- ii libx11-dev:amd642:1.5.0-1 amd64 X11 client-side library (development headers) When I compile with the g++ flag '-std=gnu++0x', I get the following error: In file included from /usr/include/X11/extensions/xf86vmode.h:37:0, from src/engine/../linux/LinuxGLWindow.h:31, from src/engine/../linux/Common.h:11, from src/engine/IceGraphicsEngine.h:27, from src/engine/IceGraphicsEngine.cpp:8: /usr/include/X11/Xmd.h:143:16: error: conflicting declaration ‘typedef CARD8 BOOL’ My guess is the new c++ features has a conflict or something here... If I remove line 143 from Xmd.h, I no longer see this error. What's the other declaration it conflicts with? Cheers, Julien -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/50bff08d.9060...@chisholmsoft.com
Bug#695064: conflicting declaration ‘typedef CARD8 BOOL’ in xmd.h
Package: libx11-dev:amd64 Version: 2:1.5.0-1 Hi, I'm building a c++ application, which includes xf86vmode.h header. I think this is part of the X11 library header files. Here is the dpkg output: jarrett@debian:~/$ dpkg --list libx11-dev Desired=Unknown/Install/Remove/Purge/Hold | Status=Not/Inst/Conf-files/Unpacked/halF-conf/Half-inst/trig-aWait/Trig-pend |/ Err?=(none)/Reinst-required (Status,Err: uppercase=bad) ||/ NameVersionArchitecture Description +++-===-==-==- ii libx11-dev:amd642:1.5.0-1 amd64 X11 client-side library (development headers) When I compile with the g++ flag '-std=gnu++0x', I get the following error: In file included from /usr/include/X11/extensions/xf86vmode.h:37:0, from src/engine/../linux/LinuxGLWindow.h:31, from src/engine/../linux/Common.h:11, from src/engine/IceGraphicsEngine.h:27, from src/engine/IceGraphicsEngine.cpp:8: /usr/include/X11/Xmd.h:143:16: error: conflicting declaration ‘typedef CARD8 BOOL’ My guess is the new c++ features has a conflict or something here... If I remove line 143 from Xmd.h, I no longer see this error. Cheers Jarrett PS: the reportbug application crashed (I was using the gtk version) with this error: jarrett@debian:~$ reportbug *** glibc detected *** ** Gdk:ERROR:/tmp/buildd/gtk+2.0-2.24.10/gdk/gdkregion-generic.c:1110:miUnionNonO: assertion failed: (y1 y2) Aborted
Bug#695064: conflicting declaration ‘typedef CARD8 BOOL’ in xmd.h
Control: reassign -1 x11proto-core-dev Control: tag -1 moreinfo On Mon, Dec 3, 2012 at 13:24:55 -0500, Jarrett Chisholm wrote: I'm building a c++ application, which includes xf86vmode.h header. I think this is part of the X11 library header files. Here is the dpkg output: Xmd.h is not, but close enough. It's part of the X11 protocol headers. jarrett@debian:~/$ dpkg --list libx11-dev Desired=Unknown/Install/Remove/Purge/Hold | Status=Not/Inst/Conf-files/Unpacked/halF-conf/Half-inst/trig-aWait/Trig-pend |/ Err?=(none)/Reinst-required (Status,Err: uppercase=bad) ||/ NameVersionArchitecture Description +++-===-==-==- ii libx11-dev:amd642:1.5.0-1 amd64 X11 client-side library (development headers) When I compile with the g++ flag '-std=gnu++0x', I get the following error: In file included from /usr/include/X11/extensions/xf86vmode.h:37:0, from src/engine/../linux/LinuxGLWindow.h:31, from src/engine/../linux/Common.h:11, from src/engine/IceGraphicsEngine.h:27, from src/engine/IceGraphicsEngine.cpp:8: /usr/include/X11/Xmd.h:143:16: error: conflicting declaration ‘typedef CARD8 BOOL’ My guess is the new c++ features has a conflict or something here... If I remove line 143 from Xmd.h, I no longer see this error. What's the other declaration it conflicts with? Cheers, Julien signature.asc Description: Digital signature
Processed: reassign 470245 to x11proto-input-dev, retitle 470245 to including Xmd.h in XI.h breaks qt ...
Processing commands for [EMAIL PROTECTED]: # Automatically generated email from bts, devscripts version 2.10.18.1 # fix at http://cgit.freedesktop.org/xorg/proto/inputproto/patch/?id=b5cbe2d93f6c0129b8f29da97778f6d1b15c38f9 reassign 470245 x11proto-input-dev Bug#470245: baghira: FTBFS: Xmd.h:137: error: conflicting declaration 'typedef long int INT32' Bug reassigned from package `baghira' to `x11proto-input-dev'. retitle 470245 including Xmd.h in XI.h breaks qt Bug#470245: baghira: FTBFS: Xmd.h:137: error: conflicting declaration 'typedef long int INT32' Changed Bug title to `including Xmd.h in XI.h breaks qt' from `baghira: FTBFS: Xmd.h:137: error: conflicting declaration 'typedef long int INT32''. tags 470245 upstream fixed-upstream Bug#470245: including Xmd.h in XI.h breaks qt There were no tags set. Tags added: upstream, fixed-upstream End of message, stopping processing here. Please contact me if you need assistance. Debian bug tracking system administrator (administrator, Debian Bugs database) -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Bug#470245: marked as done (including Xmd.h in XI.h breaks qt)
Your message dated Mon, 10 Mar 2008 14:02:09 + with message-id [EMAIL PROTECTED] and subject line Bug#470245: fixed in x11proto-input 1.4.3-2 has caused the Debian Bug report #470245, regarding including Xmd.h in XI.h breaks qt to be marked as done. This means that you claim that the problem has been dealt with. If this is not the case it is now your responsibility to reopen the Bug report if necessary, and/or fix the problem forthwith. (NB: If you are a system administrator and have no idea what this message is talking about, this may indicate a serious mail system misconfiguration somewhere. Please contact [EMAIL PROTECTED] immediately.) -- 470245: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=470245 Debian Bug Tracking System Contact [EMAIL PROTECTED] with problems ---BeginMessage--- Package: baghira Version: 0.8-1 Severity: serious User: [EMAIL PROTECTED] Usertags: qa-ftbfs-20080308 qa-ftbfs Justification: FTBFS on i386 Hi, During a rebuild of all packages in sid, your package failed to build on i386. Relevant part: if /bin/sh ../libtool --silent --mode=compile --tag=CXX i486-linux-gnu-g++ -DHAVE_CONFIG_H -I. -I. -I.. -I/usr/include/kde -I/usr/include/qt3 -I. -DQT_THREAD_SUPPORT -D_REENTRANT -Wno-long-long -Wundef -ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -Wchar-subscripts -Wall -W -Wpointer-arith -DNDEBUG -DNO_DEBUG -O2 -Wformat-security -Wmissing-format-attribute -Wno-non-virtual-dtor -fno-exceptions -fno-check-new -fno-common -MT libbaghirastarter_la.all_cpp.lo -MD -MP -MF .deps/libbaghirastarter_la.all_cpp.Tpo -c -o libbaghirastarter_la.all_cpp.lo libbaghirastarter_la.all_cpp.cpp; \ then mv -f .deps/libbaghirastarter_la.all_cpp.Tpo .deps/libbaghirastarter_la.all_cpp.Plo; else rm -f .deps/libbaghirastarter_la.all_cpp.Tpo; exit 1; fi In file included from /usr/include/X11/extensions/XI.h:55, from /usr/include/X11/extensions/XInput.h:56, from /usr/include/X11/extensions/XTest.h:50, from menu.cpp:42, from libbaghirastarter_la.all_cpp.cpp:3: /usr/include/X11/Xmd.h:137: error: conflicting declaration 'typedef long int INT32' /usr/include/qt3/qglobal.h:709: error: 'INT32' has a previous declaration as 'typedef int INT32' In file included from libbaghirastarter_la.all_cpp.cpp:3: menu.h: In constructor 'StartMenuButton::StartMenuButton(int, QString, QString, QString, StartMenuButton::Orientation, QWidget*, const char*)': menu.h:106: warning: 'StartMenuButton::m_title' will be initialized after menu.h:105: warning: 'QString StartMenuButton::m_command' menu.cpp:91: warning: when initialized here menu.h:107: warning: 'StartMenuButton::m_icon' will be initialized after menu.h:102: warning: 'StartMenuButton::Orientation StartMenuButton::m_orientation' menu.cpp:91: warning: when initialized here menu.cpp: At global scope: menu.cpp:151: warning: unused parameter 'pt' menu.h: In constructor 'Panel::Panel(int, QWidget*, const char*)': menu.h:63: warning: 'Panel::_draggedMe' will be initialized after menu.h:61: warning: 'int Panel::_count' menu.cpp:557: warning: when initialized here menu.h:68: warning: 'Panel::_poof' will be initialized after menu.h:64: warning: 'int Panel::_poofIndex' menu.cpp:557: warning: when initialized here menu.h:67: warning: 'Panel::_poofAnimPix' will be initialized after menu.h:66: warning: 'QPixmap* Panel::_poofPix' menu.cpp:557: warning: when initialized here menu.cpp: In member function 'void Panel::save(KConfig*)': menu.cpp:598: warning: suggest parentheses around assignment used as truth value menu.cpp: In member function 'void Panel::reloadIcons(int)': menu.cpp:635: warning: suggest parentheses around assignment used as truth value menu.cpp: In member function 'void Panel::updateSize(int)': menu.cpp:684: warning: suggest parentheses around assignment used as truth value menu.cpp:691: warning: suggest parentheses around assignment used as truth value menu.cpp: In member function 'virtual void Panel::dropEvent(QDropEvent*)': menu.cpp:949: warning: unused variable 'bt' menu.cpp: In member function 'void Panel::setOrientation(Qt::Orientation)': menu.cpp:1075: warning: suggest parentheses around assignment used as truth value menu.cpp: In member function 'void AppList::reset()': menu.cpp:1706: warning: comparison between signed and unsigned integer expressions menu.h: In constructor 'StartMenu::StartMenu(int, QWidget*, uint)': menu.h:301: warning: 'StartMenu::_size' will be initialized after menu.h:299: warning: 'bool StartMenu::inMove' menu.cpp:1713: warning: when initialized here In file included from libbaghirastarter_la.all_cpp.cpp:4: starter.cpp: At global scope: starter.cpp:292: warning: unused parameter 'height' starter.cpp:297: warning: unused parameter 'width' make[3]: *** [libbaghirastarter_la.all_cpp.lo] Error 1 The full build log is available
Processed: Re: Bug#164917: xlibs-dev: moving away from Xmd.h arch dependencies
Processing commands for [EMAIL PROTECTED]: tags 164917 + wontfix Bug#164917: xlibs-dev: moving away from Xmd.h arch dependencies Tags were: moreinfo patch upstream Tags added: wontfix thanks Stopping processing here. Please contact me if you need assistance. Debian bug tracking system administrator (administrator, Debian Bugs database) -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Bug#164917: marked as done (xlibs-dev: moving away from Xmd.h arch dependencies)
Your message dated Sun, 26 Nov 2006 03:18:10 -0800 with message-id [EMAIL PROTECTED] and subject line Bug#164917: xlibs-dev: moving away from Xmd.h arch dependencies has caused the attached Bug report to be marked as done. This means that you claim that the problem has been dealt with. If this is not the case it is now your responsibility to reopen the Bug report if necessary, and/or fix the problem forthwith. (NB: If you are a system administrator and have no idea what I am talking about this indicates a serious mail system misconfiguration somewhere. Please contact me immediately.) Debian bug tracking system administrator (administrator, Debian Bugs database) ---BeginMessage--- Package: xlibs-dev Version: 4.2.1-2 Severity: wishlist Tags: upstream patch This patch is an effort to start moving X into a more architecture agnostic source code. I am going to join the xpert list and see if why they don't use exact integer types. This may kill the need for most or all of the architecture dependencies in Xmd.h --- /usr/include/X11/Xmd.h 2002-10-08 01:05:41.0 -0500 +++ includes/Xmd.h 2002-10-13 22:54:46.0 -0500 @@ -55,9 +55,11 @@ /* * Special per-machine configuration flags. */ -#ifdef CRAY +#if !defined(WORD64) defined(CRAY) #define WORD64 /* 64-bit architecture */ #endif + +#if !defined(LONG64) #if defined(__alpha) || defined(__alpha__) || \ defined(__ia64__) || defined(ia64) || \ defined(__sparc64__) || \ @@ -65,7 +67,9 @@ (defined(__hppa__) defined(__LP64__)) #define LONG64 /* 32/64-bit architecture */ #endif -#ifdef __sgi +#endif + +#if !defined(LONG64) defined(__sgi) #if (_MIPS_SZLONG == 64) #define LONG64 #endif -- System Information: Debian Release: testing/unstable Architecture: i386 Kernel: Linux braindead 2.5.42acpidebug #1 SMP Mon Oct 14 20:29:43 CDT 2002 i686 Locale: LANG=C, LC_CTYPE=C Versions of packages xlibs-dev depends on: ii libc6-dev 2.2.5-15 GNU C Library: Development Librari ii xlibs 4.2.1-2X Window System client libraries -- no debconf information ---End Message--- ---BeginMessage--- tags 164917 + wontfix thanks The patch suggested in this bug has not been applied upstream in the four years since it was suggested, and no longer applies cleanly. It is predominantly whitespace changes and syntactic edits with no semantic difference. It does not fix any bugs with this package or those that depend on it, as far as I can tell. It seems to me that this patch should be cleaned up and submitted upstream if it's worthwhile, and should not be applied by Debian unless and until it appears in an upstream release. So I'm marking this bug wontfix and closing it. --Jamey signature.asc Description: Digital signature ---End Message---
Bug#164917: xlibs-dev: moving away from Xmd.h arch dependencies
Here is a patch that includes the move toward arch independence and includes a major cleanup of the preprocessor directives in Xmd.h. It converts all #ifdef to #if defined(symbol) and #ifndef to #if !defined(symbol) except for the header test at the top. Warren --- /usr/include/X11/Xmd.h 2002-10-08 01:05:41.0 -0500 +++ Xmd2.h 2002-10-15 23:28:16.0 -0500 @@ -55,20 +55,24 @@ /* * Special per-machine configuration flags. */ -#ifdef CRAY -#define WORD64 /* 64-bit architecture */ +#if !defined(WORD64) defined(CRAY) +# define WORD64/* 64-bit architecture */ #endif -#if defined(__alpha) || defined(__alpha__) || \ + +#if !defined(LONG64) +# if defined(__alpha) || defined(__alpha__) || \ defined(__ia64__) || defined(ia64) || \ defined(__sparc64__) || \ defined(__s390x__) || \ (defined(__hppa__) defined(__LP64__)) -#define LONG64 /* 32/64-bit architecture */ -#endif -#ifdef __sgi -#if (_MIPS_SZLONG == 64) -#define LONG64 +# define LONG64 /* 32/64-bit architecture */ +# endif #endif + +#if !defined(LONG64) defined(__sgi) +# if (_MIPS_SZLONG == 64) +# define LONG64 +# endif #endif /* @@ -76,7 +80,7 @@ * on a 32-bit machine and must coorespond to the protocol. */ #ifdef WORD64 -#define MUSTCOPY +# define MUSTCOPY #endif /* WORD64 */ @@ -95,10 +99,10 @@ * expand correctly before the concatenation, rather than afterward. */ #if ((defined(__STDC__) || defined(__cplusplus) || defined(c_plusplus)) !defined(UNIXCPP)) || defined(ANSICPP) -#define _SIZEOF(x) sz_##x -#define SIZEOF(x) _SIZEOF(x) +# define _SIZEOF(x) sz_##x +# define SIZEOF(x) _SIZEOF(x) #else -#define SIZEOF(x) sz_/**/x +# define SIZEOF(x) sz_/**/x #endif /* if ANSI C compiler else not */ /* @@ -106,32 +110,32 @@ * need them. Note that bitfields are not guarranteed to be signed * (or even unsigned) according to ANSI C. */ -#ifdef WORD64 +#if defined(WORD64) typedef long INT64; typedef unsigned long CARD64; -#define B32 :32 -#define B16 :16 -#ifdef UNSIGNEDBITFIELDS +# define B32 :32 +# define B16 :16 +# if defined(UNSIGNEDBITFIELDS) typedef unsigned int INT32; typedef unsigned int INT16; -#else -#ifdef __STDC__ +# else +# if defined(__STDC__) typedef signed int INT32; typedef signed int INT16; -#else +# else typedef int INT32; typedef int INT16; -#endif -#endif +# endif +# endif #else -#define B32 -#define B16 -#ifdef LONG64 +# define B32 +# define B16 +# if defined(LONG64) typedef long INT64; typedef int INT32; -#else +# else typedef long INT32; -#endif +# endif typedef short INT16; #endif @@ -141,7 +145,7 @@ typedef char INT8; #endif -#ifdef LONG64 +#if defined(LONG64) typedef unsigned long CARD64; typedef unsigned int CARD32; #else @@ -153,7 +157,7 @@ typedef CARD32 BITS32; typedef CARD16 BITS16; -#ifndef __EMX__ +#if !defined(__EMX__) typedef CARD8 BYTE; typedef CARD8 BOOL; #else /* __EMX__ */ @@ -161,33 +165,33 @@ * This is bad style, but the central include file os2.h declares them * as well */ -#define BYTE CARD8 -#define BOOL CARD8 +# define BYTE CARD8 +# define BOOL CARD8 #endif /* __EMX__ */ /* * definitions for sign-extending bitfields on 64-bit architectures */ #if defined(WORD64) defined(UNSIGNEDBITFIELDS) -#define cvtINT8toInt(val) (((val) 0x0080) ? ((val) | 0xff00) : (val)) -#define cvtINT16toInt(val) (((val) 0x8000) ? ((val) | 0x) : (val)) -#define cvtINT32toInt(val) (((val) 0x8000) ? ((val) | 0x) : (val)) -#define cvtINT8toShort(val) cvtINT8toInt(val) -#define cvtINT16toShort(val) cvtINT16toInt(val) -#define cvtINT32toShort(val) cvtINT32toInt(val) -#define cvtINT8toLong(val) cvtINT8toInt(val) -#define cvtINT16toLong(val) cvtINT16toInt(val) -#define cvtINT32toLong(val) cvtINT32toInt(val) -#else -#define cvtINT8toInt(val) (val) -#define cvtINT16toInt(val) (val) -#define cvtINT32toInt(val) (val) -#define cvtINT8toShort(val) (val) -#define cvtINT16toShort(val) (val) -#define cvtINT32toShort(val) (val) -#define cvtINT8toLong(val) (val) -#define cvtINT16toLong(val) (val) -#define cvtINT32toLong(val) (val) +# define cvtINT8toInt(val) (((val) 0x0080) ? ((val) | 0xff00) : (val)) +# define cvtINT16toInt(val) (((val) 0x8000) ? ((val) | 0x) : (val)) +# define cvtINT32toInt(val) (((val) 0x8000) ? ((val) | 0x) : (val)) +# define cvtINT8toShort(val) cvtINT8toInt(val) +# define cvtINT16toShort(val) cvtINT16toInt(val) +# define cvtINT32toShort(val) cvtINT32toInt(val) +# define cvtINT8toLong(val) cvtINT8toInt(val) +# define cvtINT16toLong(val) cvtINT16toInt(val) +# define cvtINT32toLong(val) cvtINT32toInt(val) +#else +# define cvtINT8toInt(val) (val) +# define cvtINT16toInt(val) (val) +# define
Re: Xmd.h arch dependency
On Mon, Oct 14, 2002 at 07:06:22PM -0500, Warren Turkal wrote: There is an arch dependency in Xmd.h, and the diff will hopefully allow progress toward a non-arch dependent version of this file. Please file a bug containing this patch against xlibs-dev so we don't lose track of it. -- G. Branden Robinson|If you wish to strive for peace of Debian GNU/Linux |soul, then believe; if you wish to [EMAIL PROTECTED] |be a devotee of truth, then http://people.debian.org/~branden/ |inquire. -- Friedrich Nietzsche pgpthSGZvTAWO.pgp Description: PGP signature
Bug#164917: xlibs-dev: moving away from Xmd.h arch dependencies
Package: xlibs-dev Version: 4.2.1-2 Severity: wishlist Tags: upstream patch This patch is an effort to start moving X into a more architecture agnostic source code. I am going to join the xpert list and see if why they don't use exact integer types. This may kill the need for most or all of the architecture dependencies in Xmd.h --- /usr/include/X11/Xmd.h 2002-10-08 01:05:41.0 -0500 +++ includes/Xmd.h 2002-10-13 22:54:46.0 -0500 @@ -55,9 +55,11 @@ /* * Special per-machine configuration flags. */ -#ifdef CRAY +#if !defined(WORD64) defined(CRAY) #define WORD64 /* 64-bit architecture */ #endif + +#if !defined(LONG64) #if defined(__alpha) || defined(__alpha__) || \ defined(__ia64__) || defined(ia64) || \ defined(__sparc64__) || \ @@ -65,7 +67,9 @@ (defined(__hppa__) defined(__LP64__)) #define LONG64 /* 32/64-bit architecture */ #endif -#ifdef __sgi +#endif + +#if !defined(LONG64) defined(__sgi) #if (_MIPS_SZLONG == 64) #define LONG64 #endif -- System Information: Debian Release: testing/unstable Architecture: i386 Kernel: Linux braindead 2.5.42acpidebug #1 SMP Mon Oct 14 20:29:43 CDT 2002 i686 Locale: LANG=C, LC_CTYPE=C Versions of packages xlibs-dev depends on: ii libc6-dev 2.2.5-15 GNU C Library: Development Librari ii xlibs 4.2.1-2X Window System client libraries -- no debconf information
Processed: Re: Bug#164917: xlibs-dev: moving away from Xmd.h arch dependencies
Processing commands for [EMAIL PROTECTED]: tag 164917 + moreinfo Bug#164917: xlibs-dev: moving away from Xmd.h arch dependencies Tags added: moreinfo thanks Stopping processing here. Please contact me if you need assistance. Debian bug tracking system administrator (administrator, Debian Bugs database)
Bug#164917: xlibs-dev: moving away from Xmd.h arch dependencies
tag 164917 + moreinfo thanks On Tue, Oct 15, 2002 at 07:41:43PM -0500, Warren Turkal wrote: This patch is an effort to start moving X into a more architecture agnostic source code. I am going to join the xpert list and see if why they don't use exact integer types. This may kill the need for most or all of the architecture dependencies in Xmd.h I'm going to hold off on appyling this until I know whether or not upstream thinks it's a good idea. -- G. Branden Robinson|It was a typical net.exercise -- a Debian GNU/Linux |screaming mob pounding on a greasy [EMAIL PROTECTED] |spot on the pavement, where used to http://people.debian.org/~branden/ |lie the carcass of a dead horse. pgpnKUxDvAJ9A.pgp Description: PGP signature
Re: Xmd.h arch dependency
On Mon, Oct 14, 2002 at 07:06:22PM -0500, Warren Turkal wrote: There is an arch dependency in Xmd.h, and the diff will hopefully allow progress toward a non-arch dependent version of this file. Please file a bug containing this patch against xlibs-dev so we don't lose track of it. -- G. Branden Robinson|If you wish to strive for peace of Debian GNU/Linux |soul, then believe; if you wish to [EMAIL PROTECTED] |be a devotee of truth, then http://people.debian.org/~branden/ |inquire. -- Friedrich Nietzsche msg04176/pgp0.pgp Description: PGP signature
Bug#164917: xlibs-dev: moving away from Xmd.h arch dependencies
Package: xlibs-dev Version: 4.2.1-2 Severity: wishlist Tags: upstream patch This patch is an effort to start moving X into a more architecture agnostic source code. I am going to join the xpert list and see if why they don't use exact integer types. This may kill the need for most or all of the architecture dependencies in Xmd.h --- /usr/include/X11/Xmd.h 2002-10-08 01:05:41.0 -0500 +++ includes/Xmd.h 2002-10-13 22:54:46.0 -0500 @@ -55,9 +55,11 @@ /* * Special per-machine configuration flags. */ -#ifdef CRAY +#if !defined(WORD64) defined(CRAY) #define WORD64 /* 64-bit architecture */ #endif + +#if !defined(LONG64) #if defined(__alpha) || defined(__alpha__) || \ defined(__ia64__) || defined(ia64) || \ defined(__sparc64__) || \ @@ -65,7 +67,9 @@ (defined(__hppa__) defined(__LP64__)) #define LONG64 /* 32/64-bit architecture */ #endif -#ifdef __sgi +#endif + +#if !defined(LONG64) defined(__sgi) #if (_MIPS_SZLONG == 64) #define LONG64 #endif -- System Information: Debian Release: testing/unstable Architecture: i386 Kernel: Linux braindead 2.5.42acpidebug #1 SMP Mon Oct 14 20:29:43 CDT 2002 i686 Locale: LANG=C, LC_CTYPE=C Versions of packages xlibs-dev depends on: ii libc6-dev 2.2.5-15 GNU C Library: Development Librari ii xlibs 4.2.1-2X Window System client libraries -- no debconf information -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Processed: Re: Bug#164917: xlibs-dev: moving away from Xmd.h arch dependencies
Processing commands for [EMAIL PROTECTED]: tag 164917 + moreinfo Bug#164917: xlibs-dev: moving away from Xmd.h arch dependencies Tags added: moreinfo thanks Stopping processing here. Please contact me if you need assistance. Debian bug tracking system administrator (administrator, Debian Bugs database) -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Bug#164917: xlibs-dev: moving away from Xmd.h arch dependencies
tag 164917 + moreinfo thanks On Tue, Oct 15, 2002 at 07:41:43PM -0500, Warren Turkal wrote: This patch is an effort to start moving X into a more architecture agnostic source code. I am going to join the xpert list and see if why they don't use exact integer types. This may kill the need for most or all of the architecture dependencies in Xmd.h I'm going to hold off on appyling this until I know whether or not upstream thinks it's a good idea. -- G. Branden Robinson|It was a typical net.exercise -- a Debian GNU/Linux |screaming mob pounding on a greasy [EMAIL PROTECTED] |spot on the pavement, where used to http://people.debian.org/~branden/ |lie the carcass of a dead horse. msg04190/pgp0.pgp Description: PGP signature
Xmd.h arch dependency
There is an arch dependency in Xmd.h, and the diff will hopefully allow progress toward a non-arch dependent version of this file. Warren --- /usr/include/X11/Xmd.h 2002-10-08 01:05:41.0 -0500 +++ includes/Xmd.h 2002-10-13 22:54:46.0 -0500 @@ -55,9 +55,11 @@ /* * Special per-machine configuration flags. */ -#ifdef CRAY +#if !defined(WORD64) defined(CRAY) #define WORD64 /* 64-bit architecture */ #endif + +#if !defined(LONG64) #if defined(__alpha) || defined(__alpha__) || \ defined(__ia64__) || defined(ia64) || \ defined(__sparc64__) || \ @@ -65,7 +67,9 @@ (defined(__hppa__) defined(__LP64__)) #define LONG64 /* 32/64-bit architecture */ #endif -#ifdef __sgi +#endif + +#if !defined(LONG64) defined(__sgi) #if (_MIPS_SZLONG == 64) #define LONG64 #endif -- Treasurer, GOLUM, Inc. http://www.golum.org
Xmd.h
Should X clients include Xmd.h? -- Treasurer, GOLUM, Inc. http://www.golum.org
Xmd.h arch dependency
There is an arch dependency in Xmd.h, and the diff will hopefully allow progress toward a non-arch dependent version of this file. Warren --- /usr/include/X11/Xmd.h 2002-10-08 01:05:41.0 -0500 +++ includes/Xmd.h 2002-10-13 22:54:46.0 -0500 @@ -55,9 +55,11 @@ /* * Special per-machine configuration flags. */ -#ifdef CRAY +#if !defined(WORD64) defined(CRAY) #define WORD64 /* 64-bit architecture */ #endif + +#if !defined(LONG64) #if defined(__alpha) || defined(__alpha__) || \ defined(__ia64__) || defined(ia64) || \ defined(__sparc64__) || \ @@ -65,7 +67,9 @@ (defined(__hppa__) defined(__LP64__)) #define LONG64 /* 32/64-bit architecture */ #endif -#ifdef __sgi +#endif + +#if !defined(LONG64) defined(__sgi) #if (_MIPS_SZLONG == 64) #define LONG64 #endif -- Treasurer, GOLUM, Inc. http://www.golum.org -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Xmd.h
Should X clients include Xmd.h? -- Treasurer, GOLUM, Inc. http://www.golum.org -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
