changeset: 5358:2c4a037960ff tag: tip user: Aidan Kehoe <kehoea(a)parhasard.net&gt; date: Sun Nov 07 23:30:01 2010 +0000 files: src/ChangeLog.carbon2 src/event-carbon.c src/glyphs-carbon.c src/glyphs.c description: Fix the Carbon2 build, use non-in-tree XPM and avoid reserved words. src/ChangeLog.carbon2 addition: 2010-11-07 Aidan Kehoe <kehoea(a)parhasard.net&gt; * glyphs.c: Dont #include the in-tree carbon library here, it breaks the build. * glyphs-carbon.c: Hackishly use the X11 include files here; really the right answer is not to include the XPM library with the Carbon build at all. * event-carbon.c (debug_print_event): Don't confuse the C++ compiler by using a reserved word as a parameter name. diff -r 5a1589f26876 -r 2c4a037960ff src/ChangeLog.carbon2 --- a/src/ChangeLog.carbon2 Sun Nov 07 23:01:49 2010 +0000 +++ b/src/ChangeLog.carbon2 Sun Nov 07 23:30:01 2010 +0000 ＠＠ -1,3 +1,13 ＠＠ +2010-11-07 Aidan Kehoe <kehoea(a)parhasard.net&gt; + + * glyphs.c: Dont #include the in-tree carbon library here, it + breaks the build. + * glyphs-carbon.c: Hackishly use the X11 include files here; + really the right answer is not to include the XPM library with the + Carbon build at all. + * event-carbon.c (debug_print_event): Don't confuse the C++ + compiler by using a reserved word as a parameter name. + 2010-06-04 Aidan Kehoe <kehoea(a)parhasard.net&gt; * select-carbon.c (pasteboard_get_utext_or_text): diff -r 5a1589f26876 -r 2c4a037960ff src/event-carbon.c --- a/src/event-carbon.c Sun Nov 07 23:01:49 2010 +0000 +++ b/src/event-carbon.c Sun Nov 07 23:30:01 2010 +0000 ＠＠ -488,9 +488,9 ＠＠ } static void -debug_print_event (EventClass class, UInt32 kind) +debug_print_event (EventClass klasse, UInt32 kind) { - stderr_out ("Class = %c%c%c%c; ", (char)(class >> 24), (char)(class >> 16 & 0xff), (char)(class >> 8 & 0xff), (char)(class & 0xff)); + stderr_out ("Class = %c%c%c%c; ", (char)(klasse >> 24), (char)(klasse >> 16 & 0xff), (char)(klasse >> 8 & 0xff), (char)(klasse & 0xff)); stderr_out ("kind = %lu", kind); } diff -r 5a1589f26876 -r 2c4a037960ff src/glyphs-carbon.c --- a/src/glyphs-carbon.c Sun Nov 07 23:01:49 2010 +0000 +++ b/src/glyphs-carbon.c Sun Nov 07 23:30:01 2010 +0000 ＠＠ -26,8 +26,6 ＠＠ #include "console-carbon-impl.h" #include "fontcolor-carbon-impl.h" - -#include "../carbon/xpm/xpm.h" extern unsigned long carbon_string_to_color (const Ibyte *); ＠＠ -322,6 +320,9 ＠＠ **********************************************************************/ #ifdef HAVE_XPM + +#define Cursor X11Cursor +#include <X11/xpm.h> #define BPLINE(width) ((int)(~3UL & (unsigned long)((width) +3))) diff -r 5a1589f26876 -r 2c4a037960ff src/glyphs.c --- a/src/glyphs.c Sun Nov 07 23:01:49 2010 +0000 +++ b/src/glyphs.c Sun Nov 07 23:30:01 2010 +0000 ＠＠ -66,12 +66,8 ＠＠ #include "sysfile.h" -#if defined (HAVE_XPM) && !defined (HAVE_GTK) && !defined (HAVE_CARBON) +#if defined (HAVE_XPM) && !defined (HAVE_GTK) #include <X11/xpm.h> -#endif - -#if defined (HAVE_XPM) && defined (HAVE_CARBON) -#include "../carbon/xpm/xpm.h" #endif Lisp_Object Qimage_conversion_error; _______________________________________________ XEmacs-Patches mailing list XEmacs-Patches(a)xemacs.org http://lists.xemacs.org/mailman/listinfo/xemacs-patches