Index: emacs/src/macgui.h
diff -c emacs/src/macgui.h:1.21 emacs/src/macgui.h:1.22
*** emacs/src/macgui.h:1.21 Sun Aug 7 12:33:17 2005
--- emacs/src/macgui.h Wed Aug 31 08:35:44 2005
***
*** 87,92
--- 87,96
#define FACE_DEFAULT (~0)
+ #if !TARGET_API_MAC_CARBON
+
Index: emacs/src/macgui.h
diff -c emacs/src/macgui.h:1.20 emacs/src/macgui.h:1.21
*** emacs/src/macgui.h:1.20 Mon Jul 18 05:39:27 2005
--- emacs/src/macgui.h Sun Aug 7 12:33:17 2005
***
*** 1,5
/* Definitions and headers for communication on the Mac OS.
!Copyright (C) 2
Index: emacs/src/macgui.h
diff -c emacs/src/macgui.h:1.19 emacs/src/macgui.h:1.20
*** emacs/src/macgui.h:1.19 Mon Jul 4 16:06:33 2005
--- emacs/src/macgui.h Mon Jul 18 05:39:27 2005
***
*** 180,194
XFontStruct *font;
} XGCValues;
! typedef XGCValues *GC;
!
! extern
Index: emacs/src/macgui.h
diff -c emacs/src/macgui.h:1.18 emacs/src/macgui.h:1.19
*** emacs/src/macgui.h:1.18 Fri Apr 29 09:00:45 2005
--- emacs/src/macgui.h Mon Jul 4 16:06:33 2005
***
*** 15,22
You should have received a copy of the GNU General Public License
along w
Index: emacs/src/macgui.h
diff -c emacs/src/macgui.h:1.17 emacs/src/macgui.h:1.18
*** emacs/src/macgui.h:1.17 Tue Apr 19 12:03:38 2005
--- emacs/src/macgui.h Fri Apr 29 09:00:45 2005
***
*** 32,38
--- 32,40
#ifdef HAVE_CARBON
#undef Z
#ifdef MAC_OSX
+ #if ! HAVE_MKT
Index: emacs/src/macgui.h
diff -c emacs/src/macgui.h:1.16 emacs/src/macgui.h:1.17
*** emacs/src/macgui.h:1.16 Wed Mar 16 08:07:05 2005
--- emacs/src/macgui.h Tue Apr 19 12:03:38 2005
***
*** 101,112
(xcs).descent = (bds).bottom)
struct MacFontStruct {
! char *fontn