Remove support for Mac Carbon.

* mactoolbox.c:
* macterm.h:
* macterm.c:
* macselect.c:
* macmenu.c:
* macgui.h:
* macfns.c:
* mac.c: Remove file.
* s/darwin.h:
* m/intel386.h:
* xfaces.c:
* xdisp.c:
* window.c:
* tparam.c:
* termhooks.h:
* termcap.c:
* term.c:
* syssignal.h:
* sysselect.h:
* sysdep.c:
* process.c:
* lread.c:
* lisp.h:
* keyboard.c:
* image.c:
* fringe.c:
* frame.h:
* frame.c:
* fontset.c:
* font.h:
* font.c:
* fns.c:
* fileio.c:
* emacs.c:
* dispnew.c:
* dispextern.h:
* config.in:
* atimer.c:
* Makefile.in: Remove code for Carbon

* erc.el: Remove code for Carbon.

Remove support for Mac Carbon.
* term/mac-win.el: Remove file
* international/mule-cmds.el:
* version.el:
* startup.el:
* simple.el:
* mwheel.el:
* mouse.el:
* loadup.el:
* isearch.el:
* info.el:
* frame.el:
* faces.el:
* disp-table.el:
* cus-start.el:
* cus-face.el:
* cus-edit.el:
* Makefile.in: Remove code for Carbon.

Remove support for Mac Carbon.
* makefile.w32-in:
* emacsclient.c: Remove code for Carbon.

* PROBLEMS:
* MACHINES: Remove mentions of Mac Carbon.

* ns-emacs.texi:
* faq.texi: Remove mentions of Mac Carbon.

* os.texi:
* frames.texi:
* display.texi: Remove mentions of Mac Carbon.

* xresources.texi: Remove mentions of Mac Carbon.

* make-tarball.txt:
* admin.el:
* FOR-RELEASE:
* CPP-DEFINES: Remove mentions of Mac Carbon.

Remove support for Mac Carbon.
* mac: Remove directory.
* make-dist:
* configure.in:
* README:
* Makefile.in:
* INSTALL:  Remove code for Carbon.
* configure: Regenerate.

1 files changed, 0 insertions, 795 deletions

diff --git a/src/macterm.h b/src/macterm.h
deleted file mode 100644
index 28318a6d0b0..00000000000
--- a/src/macterm.h
+++ /dev/null
@@ -1,795 +0,0 @@
-/* Display module for Mac OS.
-   Copyright (C) 2000, 2001, 2002, 2003, 2004,
-                 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
-
-This file is part of GNU Emacs.
-
-GNU Emacs is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
-
-/* Contributed by Andrew Choi (akochoi@mac.com).  */
-
-#include "macgui.h"
-#include "frame.h"
-
-#define RGB_TO_ULONG(r, g, b) (((r) << 16) | ((g) << 8) | (b))
-#define ARGB_TO_ULONG(a, r, g, b) (((a) << 24) | ((r) << 16) | ((g) << 8) | (b))
-
-#define ALPHA_FROM_ULONG(color) ((color) >> 24)
-#define RED_FROM_ULONG(color) (((color) >> 16) & 0xff)
-#define GREEN_FROM_ULONG(color) (((color) >> 8) & 0xff)
-#define BLUE_FROM_ULONG(color) ((color) & 0xff)
-
-/* Do not change `* 0x101' in the following lines to `<< 8'.  If
-   changed, image masks in 1-bit depth will not work. */
-#define RED16_FROM_ULONG(color) (RED_FROM_ULONG(color) * 0x101)
-#define GREEN16_FROM_ULONG(color) (GREEN_FROM_ULONG(color) * 0x101)
-#define BLUE16_FROM_ULONG(color) (BLUE_FROM_ULONG(color) * 0x101)
-
-#define BLACK_PIX_DEFAULT(f) RGB_TO_ULONG(0,0,0)
-#define WHITE_PIX_DEFAULT(f) RGB_TO_ULONG(255,255,255)
-
-#define FONT_WIDTH(f)   ((f)->max_bounds.width)
-#define FONT_HEIGHT(f)  ((f)->ascent + (f)->descent)
-#define FONT_BASE(f)    ((f)->ascent)
-#define FONT_DESCENT(f) ((f)->descent)
-
-/* Structure recording bitmaps and reference count.
-   If REFCOUNT is 0 then this record is free to be reused.  */
-
-struct mac_bitmap_record
-{
-  char *bitmap_data;
-  char *file;
-  int refcount;
-  int height, width;
-};
-
-
-/* For each display (currently only one on mac), we have a structure that
-   records information about it.  */
-
-struct mac_display_info
-{
-  /* Chain of all mac_display_info structures.  */
-  struct mac_display_info *next;
-
-  /* The generic display parameters corresponding to this X display. */
-  struct terminal *terminal;
-
-  /* This is a cons cell of the form (NAME . FONT-LIST-CACHE).
-     The same cons cell also appears in x_display_name_list.  */
-  Lisp_Object name_list_element;
-
-  /* Number of frames that are on this display.  */
-  int reference_count;
-
-  /* Dots per inch of the screen.  */
-  double resx, resy;
-
-  /* Number of planes on this screen.  */
-  int n_planes;
-
-  /* Whether the screen supports color */
-  int color_p;
-
-  /* Dimensions of this screen.  */
-  int height, width;
-
-  /* Mask of things that cause the mouse to be grabbed.  */
-  int grabbed;
-
-#if 0
-  /* Emacs bitmap-id of the default icon bitmap for this frame.
-     Or -1 if none has been allocated yet.  */
-  int icon_bitmap_id;
-
-#endif
-  /* The root window of this screen.  */
-  Window root_window;
-
-  /* The cursor to use for vertical scroll bars.  */
-  Cursor vertical_scroll_bar_cursor;
-
-  /* Resource data base */
-  XrmDatabase xrdb;
-
-  /* A table of all the fonts we have already loaded.  */
-  struct font_info *font_table;
-
-  /* The current capacity of font_table.  */
-  int font_table_size;
-
-  /* Minimum width over all characters in all fonts in font_table.  */
-  int smallest_char_width;
-
-  /* Minimum font height over all fonts in font_table.  */
-  int smallest_font_height;
-
-  /* Reusable Graphics Context for drawing a cursor in a non-default face. */
-  GC scratch_cursor_gc;
-
-  /* These variables describe the range of text currently shown in its
-     mouse-face, together with the window they apply to.  As long as
-     the mouse stays within this range, we need not redraw anything on
-     its account.  Rows and columns are glyph matrix positions in
-     MOUSE_FACE_WINDOW.  */
-  int mouse_face_beg_row, mouse_face_beg_col;
-  int mouse_face_beg_x, mouse_face_beg_y;
-  int mouse_face_end_row, mouse_face_end_col;
-  int mouse_face_end_x, mouse_face_end_y;
-  int mouse_face_past_end;
-  Lisp_Object mouse_face_window;
-  int mouse_face_face_id;
-  Lisp_Object mouse_face_overlay;
-
-  /* 1 if a mouse motion event came and we didn't handle it right away because
-     gc was in progress.  */
-  int mouse_face_deferred_gc;
-
-  /* FRAME and X, Y position of mouse when last checked for
-     highlighting.  X and Y can be negative or out of range for the frame.  */
-  struct frame *mouse_face_mouse_frame;
-  int mouse_face_mouse_x, mouse_face_mouse_y;
-
-  /* Nonzero means defer mouse-motion highlighting.  */
-  int mouse_face_defer;
-
-  /* Nonzero means that the mouse highlight should not be shown.  */
-  int mouse_face_hidden;
-
-  int mouse_face_image_state;
-
-  char *mac_id_name;
-
-  /* The number of fonts actually stored in the font table.
-     font_table[n] is used and valid if 0 <= n < n_fonts.  0 <=
-     n_fonts <= font_table_size and font_table[i].name != 0.  */
-  int n_fonts;
-
-  /* Pointer to bitmap records.  */
-  struct mac_bitmap_record *bitmaps;
-
-  /* Allocated size of bitmaps field.  */
-  int bitmaps_size;
-
-  /* Last used bitmap index.  */
-  int bitmaps_last;
-
-  /* The frame (if any) which has the window that has keyboard focus.
-     Zero if none.  This is examined by Ffocus_frame in macfns.c.  Note
-     that a mere EnterNotify event can set this; if you need to know the
-     last frame specified in a FocusIn or FocusOut event, use
-     x_focus_event_frame.  */
-  struct frame *x_focus_frame;
-
-  /* The last frame mentioned in a FocusIn or FocusOut event.  This is
-     separate from x_focus_frame, because whether or not LeaveNotify
-     events cause us to lose focus depends on whether or not we have
-     received a FocusIn event for it.  */
-  struct frame *x_focus_event_frame;
-
-  /* The frame which currently has the visual highlight, and should get
-     keyboard input (other sorts of input have the frame encoded in the
-     event).  It points to the focus frame's selected window's
-     frame.  It differs from x_focus_frame when we're using a global
-     minibuffer.  */
-  struct frame *x_highlight_frame;
-};
-
-/* This checks to make sure we have a display.  */
-extern void check_mac P_ ((void));
-
-#define x_display_info mac_display_info
-
-/* This is a chain of structures for all the X displays currently in use.  */
-extern struct x_display_info *x_display_list;
-
-/* This is a chain of structures for all the displays currently in use.  */
-extern struct mac_display_info one_mac_display_info;
-
-/* This is a list of cons cells, each of the form (NAME . FONT-LIST-CACHE),
-   one for each element of x_display_list and in the same order.
-   NAME is the name of the frame.
-   FONT-LIST-CACHE records previous values returned by x-list-fonts.  */
-extern Lisp_Object x_display_name_list;
-
-extern struct x_display_info *x_display_info_for_name P_ ((Lisp_Object));
-
-extern struct mac_display_info *mac_term_init P_ ((Lisp_Object, char *, char *));
-
-extern Lisp_Object x_list_fonts P_ ((struct frame *, Lisp_Object, int, int));
-extern struct font_info *x_get_font_info P_ ((struct frame *f, int));
-extern struct font_info *x_load_font P_ ((struct frame *, char *, int));
-extern struct font_info *x_query_font P_ ((struct frame *, char *));
-extern void x_find_ccl_program P_ ((struct font_info *));
-
-/* When Emacs uses a tty window, tty_display in frame.c points to an
-   x_output struct .  */
-struct x_output
-{
-  unsigned long background_pixel;
-  unsigned long foreground_pixel;
-};
-
-/* The collection of data describing a window on the Mac.  */
-struct mac_output
-{
-  /* Placeholder for things accessed through output_data.x.  Must
-     appear first.  */
-  struct x_output x_compatible;
-
-  /* Menubar "widget" handle.  */
-  int menubar_widget;
-
-  FRAME_PTR mFP;                /* points back to the frame struct */
-
-  /* Here are the Graphics Contexts for the default font.  */
-  GC normal_gc;                         /* Normal video */
-  GC reverse_gc;                        /* Reverse video */
-  GC cursor_gc;                         /* cursor drawing */
-
-  /* The window used for this frame.
-     May be zero while the frame object is being created
-     and the window has not yet been created.  */
-  Window window_desc;
-
-  /* The window that is the parent of this window.
-     Usually this is a window that was made by the window manager,
-     but it can be the root window, and it can be explicitly specified
-     (see the explicit_parent field, below).  */
-  Window parent_desc;
-
-  /* Default ASCII font of this frame. */
-  XFontStruct *font;
-
-  /* The baseline offset of the default ASCII font.  */
-  int baseline_offset;
-
-  /* If a fontset is specified for this frame instead of font, this
-     value contains an ID of the fontset, else -1.  */
-  int fontset;
-
-  /* Pixel values used for various purposes.
-     border_pixel may be -1 meaning use a gray tile.  */
-  unsigned long cursor_pixel;
-  unsigned long border_pixel;
-  unsigned long mouse_pixel;
-  unsigned long cursor_foreground_pixel;
-
-#if 0
-  /* Foreground color for scroll bars.  A value of -1 means use the
-     default (black for non-toolkit scroll bars).  */
-  unsigned long scroll_bar_foreground_pixel;
-
-  /* Background color for scroll bars.  A value of -1 means use the
-     default (background color of the frame for non-toolkit scroll
-     bars).  */
-  unsigned long scroll_bar_background_pixel;
-#endif
-
-  /* Descriptor for the cursor in use for this window.  */
-  Cursor text_cursor;
-  Cursor nontext_cursor;
-  Cursor modeline_cursor;
-  Cursor hand_cursor;
-  Cursor hourglass_cursor;
-  Cursor horizontal_drag_cursor;
-#if 0
-  /* Window whose cursor is hourglass_cursor.  This window is temporarily
-     mapped to display a hourglass-cursor.  */
-  Window hourglass_window;
-
-  /* Non-zero means hourglass cursor is currently displayed.  */
-  unsigned hourglass_p : 1;
-
-  /* Flag to set when the window needs to be completely repainted.  */
-  int needs_exposure;
-
-#endif
-
-#if TARGET_API_MAC_CARBON
-  /* The Mac control reference for the hourglass (progress indicator)
-     shown at the upper-right corner of the window.  */
-  ControlRef hourglass_control;
-#endif
-
-  /* This is the Emacs structure for the display this frame is on.  */
-  /* struct w32_display_info *display_info; */
-
-  /* Nonzero means our parent is another application's window
-     and was explicitly specified.  */
-  char explicit_parent;
-
-  /* Nonzero means tried already to make this frame visible.  */
-  char asked_for_visible;
-
-  /* Relief GCs, colors etc.  */
-  struct relief
-  {
-    GC gc;
-    unsigned long pixel;
-    int allocated_p;
-  }
-  black_relief, white_relief;
-
-  /* The background for which the above relief GCs were set up.
-     They are changed only when a different background is involved.  */
-  unsigned long relief_background;
-
-  /* Width of the internal border.  */
-  int internal_border_width;
-
-  /* Hints for the size and the position of a window.  */
-  XSizeHints *size_hints;
-
-#if USE_MAC_TOOLBAR
-  /* This variable records the gravity value of the window position if
-     the window has an external tool bar when it is created.  The
-     position of the window is adjusted using this information when
-     the tool bar is first redisplayed.  Once the tool bar is
-     redisplayed, it is set to 0 in order to avoid further
-     adjustment.  */
-  int toolbar_win_gravity;
-#endif
-
-#if USE_CG_DRAWING
-  /* Quartz 2D graphics context.  */
-  CGContextRef cg_context;
-#endif
-};
-
-typedef struct mac_output mac_output;
-
-/* Return the X output data for frame F.  */
-#define FRAME_X_OUTPUT(f) ((f)->output_data.mac)
-
-/* Return the Mac window used for displaying data in frame F.  */
-#define FRAME_MAC_WINDOW(f) ((f)->output_data.mac->window_desc)
-#define FRAME_X_WINDOW(f) ((f)->output_data.mac->window_desc)
-
-#define FRAME_FONT(f) ((f)->output_data.mac->font)
-#define FRAME_FONTSET(f) ((f)->output_data.mac->fontset)
-
-#define FRAME_BASELINE_OFFSET(f) ((f)->output_data.mac->baseline_offset)
-
-#define FRAME_SIZE_HINTS(f) ((f)->output_data.mac->size_hints)
-
-/* This gives the mac_display_info structure for the display F is on.  */
-#define FRAME_MAC_DISPLAY_INFO(f) (&one_mac_display_info)
-#define FRAME_X_DISPLAY_INFO(f) (&one_mac_display_info)
-
-/* This is the `Display *' which frame F is on.  */
-#define FRAME_MAC_DISPLAY(f) (0)
-#define FRAME_X_DISPLAY(f) (0)
-
-/* This is the 'font_info *' which frame F has.  */
-#define FRAME_MAC_FONT_TABLE(f) (FRAME_MAC_DISPLAY_INFO (f)->font_table)
-
-/* Value is the smallest width of any character in any font on frame F.  */
-
-#define FRAME_SMALLEST_CHAR_WIDTH(F) \
-     FRAME_MAC_DISPLAY_INFO(F)->smallest_char_width
-
-/* Value is the smallest height of any font on frame F.  */
-
-#define FRAME_SMALLEST_FONT_HEIGHT(F) \
-     FRAME_MAC_DISPLAY_INFO(F)->smallest_font_height
-
-/* Mac-specific scroll bar stuff.  */
-
-/* We represent scroll bars as lisp vectors.  This allows us to place
-   references to them in windows without worrying about whether we'll
-   end up with windows referring to dead scroll bars; the garbage
-   collector will free it when its time comes.
-
-   We use struct scroll_bar as a template for accessing fields of the
-   vector.  */
-
-struct scroll_bar {
-
-  /* These fields are shared by all vectors.  */
-  EMACS_INT size_from_Lisp_Vector_struct;
-  struct Lisp_Vector *next_from_Lisp_Vector_struct;
-
-  /* The window we're a scroll bar for.  */
-  Lisp_Object window;
-
-  /* The next and previous in the chain of scroll bars in this frame.  */
-  Lisp_Object next, prev;
-
-  /* The Mac control reference of this scroll bar.  Since this is a
-     pointer value, we store it split into two Lisp integers.  */
-  Lisp_Object control_ref_low, control_ref_high;
-
-  /* The position and size of the scroll bar in pixels, relative to the
-     frame.  */
-  Lisp_Object top, left, width, height;
-
-  /* The starting and ending positions of the handle, relative to the
-     handle area (i.e. zero is the top position, not
-     SCROLL_BAR_TOP_BORDER).  If they're equal, that means the handle
-     hasn't been drawn yet.
-
-     These are not actually the locations where the beginning and end
-     are drawn; in order to keep handles from becoming invisible when
-     editing large files, we establish a minimum height by always
-     drawing handle bottoms VERTICAL_SCROLL_BAR_MIN_HANDLE pixels below
-     where they would be normally; the bottom and top are in a
-     different co-ordinate system.  */
-  Lisp_Object start, end;
-
-  /* If the scroll bar handle is currently being dragged by the user,
-     this is the number of pixels from the top of the handle to the
-     place where the user grabbed it.  If the handle is pressed but
-     not dragged yet, this is a negative integer whose absolute value
-     is the number of pixels plus 1.  If the handle isn't currently
-     being dragged, this is Qnil.  */
-  Lisp_Object dragging;
-
-#ifdef MAC_OSX
-  /* t if the background of the fringe that is adjacent to a scroll
-     bar is extended to the gap between the fringe and the bar.  */
-  Lisp_Object fringe_extended_p;
-#endif
-
-  /* t if redraw needed in the next XTset_vertical_scroll_bar call.  */
-  Lisp_Object redraw_needed_p;
-
-#ifdef USE_TOOLKIT_SCROLL_BARS
-  /* The position and size of the scroll bar handle track area in
-     pixels, relative to the frame.  */
-  Lisp_Object track_top, track_height;
-
-  /* Minimum length of the scroll bar handle, in pixels.  */
-  Lisp_Object min_handle;
-#endif
-};
-
-/* The number of elements a vector holding a struct scroll_bar needs.  */
-#define SCROLL_BAR_VEC_SIZE                                     \
-  ((sizeof (struct scroll_bar)                                  \
-    - sizeof (EMACS_INT) - sizeof (struct Lisp_Vector *))       \
-   / sizeof (Lisp_Object))
-
-/* Turning a lisp vector value into a pointer to a struct scroll_bar.  */
-#define XSCROLL_BAR(vec) ((struct scroll_bar *) XVECTOR (vec))
-
-
-/* Building a C long integer from two lisp integers.  */
-#define SCROLL_BAR_PACK(low, high) (XINT (high) << 16 | XINT (low))
-
-/* Setting two lisp integers to two parts of a C unsigned long.  */
-#define SCROLL_BAR_UNPACK(low, high, ulong) \
-  (XSETINT ((low),  (ulong) & 0xffff), \
-   XSETINT ((high), (ulong) >> 16))
-
-
-/* Extract the Mac control handle of the scroll bar from a struct
-   scroll_bar.  */
-#define SCROLL_BAR_CONTROL_REF(ptr)                             \
-  ((ControlRef) SCROLL_BAR_PACK ((ptr)->control_ref_low,        \
-                                 (ptr)->control_ref_high))
-
-/* Store a Mac control handle in a struct scroll_bar.  */
-#define SET_SCROLL_BAR_CONTROL_REF(ptr, ref)                            \
-  (SCROLL_BAR_UNPACK ((ptr)->control_ref_low,                           \
-                      (ptr)->control_ref_high, (unsigned long) (ref)))
-
-/* Return the inside width of a vertical scroll bar, given the outside
-   width.  */
-#define VERTICAL_SCROLL_BAR_INSIDE_WIDTH(f, width) \
-  ((width) \
-   - VERTICAL_SCROLL_BAR_LEFT_BORDER \
-   - VERTICAL_SCROLL_BAR_RIGHT_BORDER \
-   - VERTICAL_SCROLL_BAR_WIDTH_TRIM * 2)
-
-/* Return the length of the rectangle within which the top of the
-   handle must stay.  This isn't equivalent to the inside height,
-   because the scroll bar handle has a minimum height.
-
-   This is the real range of motion for the scroll bar, so when we're
-   scaling buffer positions to scroll bar positions, we use this, not
-   VERTICAL_SCROLL_BAR_INSIDE_HEIGHT.  */
-#define VERTICAL_SCROLL_BAR_TOP_RANGE(f,height) \
-  (VERTICAL_SCROLL_BAR_INSIDE_HEIGHT (f, height) \
-   - VERTICAL_SCROLL_BAR_MIN_HANDLE - UP_AND_DOWN_ARROWS)
-
-/* Return the inside height of vertical scroll bar, given the outside
-   height.  See VERTICAL_SCROLL_BAR_TOP_RANGE too.  */
-#define VERTICAL_SCROLL_BAR_INSIDE_HEIGHT(f,height) \
-  ((height) - VERTICAL_SCROLL_BAR_TOP_BORDER \
-   - VERTICAL_SCROLL_BAR_BOTTOM_BORDER)
-
-
-/* Border widths for scroll bars.
-
-   Scroll bar windows don't have any borders; their border width is
-   set to zero, and we redraw borders ourselves.  This makes the code
-   a bit cleaner, since we don't have to convert between outside width
-   (used when relating to the rest of the screen) and inside width
-   (used when sizing and drawing the scroll bar window itself).
-
-   The handle moves up and down/back and forth in a rectangle inset
-   from the edges of the scroll bar.  These are widths by which we
-   inset the handle boundaries from the scroll bar edges.  */
-#define VERTICAL_SCROLL_BAR_LEFT_BORDER (0)
-#define VERTICAL_SCROLL_BAR_RIGHT_BORDER (0)
-#define VERTICAL_SCROLL_BAR_TOP_BORDER (0)
-#define VERTICAL_SCROLL_BAR_BOTTOM_BORDER (0)
-
-/* Minimum lengths for scroll bar handles, in pixels.  */
-#define VERTICAL_SCROLL_BAR_MIN_HANDLE (16)
-
-/* Combined length of up and down arrow boxes in scroll bars, in pixels.  */
-#define UP_AND_DOWN_ARROWS (32)
-
-/* Trimming off a few pixels from each side prevents
-   text from glomming up against the scroll bar */
-#define VERTICAL_SCROLL_BAR_WIDTH_TRIM (0)
-
-/* Variations of possible Aqua scroll bar width.  */
-#define MAC_AQUA_VERTICAL_SCROLL_BAR_WIDTH (15)
-#define MAC_AQUA_SMALL_VERTICAL_SCROLL_BAR_WIDTH (11)
-
-/* Size of hourglass controls */
-#define HOURGLASS_WIDTH (15)
-#define HOURGLASS_HEIGHT (15)
-
-/* Some constants that are used locally.  */
-/* Creator code for Emacs on Mac OS.  */
-enum {
-  MAC_EMACS_CREATOR_CODE        = 'EMAx'
-};
-
-/* Apple event descriptor types */
-enum {
-  TYPE_FILE_NAME                = 'fNam'
-};
-
-/* Keywords for Apple event attributes */
-enum {
-  KEY_EMACS_SUSPENSION_ID_ATTR  = 'esId' /* typeUInt32 */
-};
-
-/* Carbon event parameter names.  */
-enum {
-  EVENT_PARAM_TEXT_INPUT_SEQUENCE_NUMBER = 'tsSn' /* typeUInt32 */
-};
-
-/* Some constants that are not defined in older versions.  */
-#if MAC_OS_X_VERSION_MAX_ALLOWED < 1030
-/* Keywords for Apple event attributes */
-enum {
-  keyReplyRequestedAttr         = 'repq'
-};
-#endif
-
-#if 0
-/* We can't determine the availability of these enumerators by
-   MAC_OS_X_VERSION_MAX_ALLOWED, because they are defined in
-   MacOSX10.3.9.sdk for Mac OS X 10.4, but not in Mac OS X 10.3.  */
-#if MAC_OS_X_VERSION_MAX_ALLOWED < 1040
-/* Gestalt selectors */
-enum {
-  gestaltSystemVersionMajor     = 'sys1',
-  gestaltSystemVersionMinor     = 'sys2',
-  gestaltSystemVersionBugFix    = 'sys3'
-};
-#endif
-#endif
-
-#ifdef MAC_OSX
-#if MAC_OS_X_VERSION_MAX_ALLOWED < 1020
-/* Apple event descriptor types */
-enum {
-  typeUTF8Text                  = 'utf8'
-};
-
-/* Carbon event parameter names */
-enum {
-  kEventParamWindowMouseLocation = 'wmou'
-};
-#endif
-
-/* kCGBitmapByteOrder32Host is defined in Universal SDK for 10.4 but
-   not in PPC SDK for 10.4.0.  */
-#if MAC_OS_X_VERSION_MAX_ALLOWED < 1050 && !defined (kCGBitmapByteOrder32Host)
-#define kCGBitmapByteOrder32Host 0
-#endif
-#endif  /* MAC_OSX */
-
-struct frame;
-struct face;
-struct image;
-
-Lisp_Object display_x_get_resource P_ ((struct x_display_info *,
-                                        Lisp_Object, Lisp_Object,
-                                        Lisp_Object, Lisp_Object));
-struct frame *check_x_frame P_ ((Lisp_Object));
-EXFUN (Fx_display_color_p, 1);
-EXFUN (Fx_display_grayscale_p, 1);
-EXFUN (Fx_display_planes, 1);
-extern void x_free_gcs P_ ((struct frame *));
-extern int XParseGeometry P_ ((char *, int *, int *, unsigned int *,
-                               unsigned int *));
-
-/* Defined in macterm.c.  */
-
-extern void x_set_window_size P_ ((struct frame *, int, int, int));
-extern void x_set_mouse_position P_ ((struct frame *, int, int));
-extern void x_set_mouse_pixel_position P_ ((struct frame *, int, int));
-extern void x_raise_frame P_ ((struct frame *));
-extern void x_lower_frame P_ ((struct frame *));
-extern void x_make_frame_visible P_ ((struct frame *));
-extern void x_make_frame_invisible P_ ((struct frame *));
-extern void x_iconify_frame P_ ((struct frame *));
-extern void x_free_frame_resources P_ ((struct frame *));
-extern void x_destroy_window P_ ((struct frame *));
-extern void x_wm_set_size_hint P_ ((struct frame *, long, int));
-extern void x_delete_display P_ ((struct x_display_info *));
-extern void mac_initialize P_ ((void));
-extern Pixmap XCreatePixmap P_ ((Display *, Window, unsigned int,
-                                 unsigned int, unsigned int));
-extern Pixmap XCreatePixmapFromBitmapData P_ ((Display *, Window, char *,
-                                               unsigned int, unsigned int,
-                                               unsigned long, unsigned long,
-                                               unsigned int));
-extern void XFreePixmap P_ ((Display *, Pixmap));
-extern GC XCreateGC P_ ((Display *, void *, unsigned long, XGCValues *));
-extern void XFreeGC P_ ((Display *, GC));
-extern void XSetForeground P_ ((Display *, GC, unsigned long));
-extern void XSetBackground P_ ((Display *, GC, unsigned long));
-extern void XDrawLine P_ ((Display *, Pixmap, GC, int, int, int, int));
-extern void mac_clear_area P_ ((struct frame *, int, int,
-                                unsigned int, unsigned int));
-extern void mac_unload_font P_ ((struct mac_display_info *, XFontStruct *));
-extern OSStatus mac_post_mouse_moved_event P_ ((void));
-extern int mac_quit_char_key_p P_ ((UInt32, UInt32));
-
-#define FONT_TYPE_FOR_UNIBYTE(font, ch) 0
-#define FONT_TYPE_FOR_MULTIBYTE(font, ch) 0
-
-#if USE_MAC_IMAGE_IO
-extern CGColorSpaceRef mac_cg_color_space_rgb;
-#endif
-
-/* Defined in macselect.c */
-
-extern void x_clear_frame_selections P_ ((struct frame *));
-EXFUN (Fx_selection_owner_p, 1);
-
-/* Defined in macfns.c */
-
-extern void x_real_positions P_ ((struct frame *, int *, int *));
-extern void x_set_menu_bar_lines P_ ((struct frame *, Lisp_Object, Lisp_Object));
-extern int x_pixel_width P_ ((struct frame *));
-extern int x_pixel_height P_ ((struct frame *));
-extern int x_char_width P_ ((struct frame *));
-extern int x_char_height P_ ((struct frame *));
-extern void x_sync P_ ((struct frame *));
-extern void x_set_tool_bar_lines P_ ((struct frame *, Lisp_Object, Lisp_Object));
-extern void mac_update_title_bar P_ ((struct frame *, int));
-extern Lisp_Object x_get_focus_frame P_ ((struct frame *));
-
-/* Defined in mac.c.  */
-
-extern void mac_clear_font_name_table P_ ((void));
-extern Lisp_Object mac_aedesc_to_lisp P_ ((const AEDesc *));
-extern OSErr mac_ae_put_lisp P_ ((AEDescList *, UInt32, Lisp_Object));
-#if TARGET_API_MAC_CARBON
-extern OSErr create_apple_event P_ ((AEEventClass, AEEventID, AppleEvent *));
-extern Lisp_Object mac_event_parameters_to_lisp P_ ((EventRef, UInt32,
-                                                     const EventParamName *,
-                                                     const EventParamType *));
-extern CFStringRef cfstring_create_with_utf8_cstring P_ ((const char *));
-extern CFStringRef cfstring_create_with_string P_ ((Lisp_Object));
-extern Lisp_Object cfdata_to_lisp P_ ((CFDataRef));
-extern Lisp_Object cfstring_to_lisp_nodecode P_ ((CFStringRef));
-extern Lisp_Object cfstring_to_lisp P_ ((CFStringRef));
-extern Lisp_Object cfnumber_to_lisp P_ ((CFNumberRef));
-extern Lisp_Object cfdate_to_lisp P_ ((CFDateRef));
-extern Lisp_Object cfboolean_to_lisp P_ ((CFBooleanRef));
-extern Lisp_Object cfobject_desc_to_lisp P_ ((CFTypeRef));
-extern Lisp_Object cfproperty_list_to_lisp P_ ((CFPropertyListRef, int, int));
-extern void mac_wakeup_from_rne P_ ((void));
-#endif
-extern void xrm_merge_string_database P_ ((XrmDatabase, const char *));
-extern Lisp_Object xrm_get_resource P_ ((XrmDatabase, const char *,
-                                         const char *));
-extern XrmDatabase xrm_get_preference_database P_ ((const char *));
-EXFUN (Fmac_get_preference, 4);
-
-/* Defined in mactoolbox.c.  */
-
-extern void mac_alert_sound_play P_ ((void));
-extern OSStatus install_application_handler P_ ((void));
-extern void mac_get_window_bounds P_ ((struct frame *, Rect *, Rect *));
-extern Rect *mac_get_frame_bounds P_ ((struct frame *, Rect *));
-extern void mac_get_frame_mouse P_ ((struct frame *, Point *));
-extern void mac_convert_frame_point_to_global P_ ((struct frame *, int *,
-                                                   int *));
-#if TARGET_API_MAC_CARBON
-extern void mac_update_proxy_icon P_ ((struct frame *));
-#endif
-extern void mac_set_frame_window_background P_ ((struct frame *,
-                                                 unsigned long));
-extern void mac_update_begin P_ ((struct frame *));
-extern void mac_update_end P_ ((struct frame *));
-extern void mac_frame_up_to_date P_ ((struct frame *));
-extern void x_flush P_ ((struct frame *));
-extern void mac_create_frame_window P_ ((struct frame *, int));
-extern void mac_dispose_frame_window P_ ((struct frame *));
-#if USE_CG_DRAWING
-extern CGContextRef mac_begin_cg_clip P_ ((struct frame *, GC));
-extern void mac_end_cg_clip P_ ((struct frame *));
-#endif
-extern void mac_begin_clip P_ ((struct frame *, GC));
-extern void mac_end_clip P_ ((struct frame *, GC));
-extern void mac_create_scroll_bar P_ ((struct scroll_bar *, const Rect *,
-                                       Boolean));
-extern void mac_dispose_scroll_bar P_ ((struct scroll_bar *));
-extern void mac_set_scroll_bar_bounds P_ ((struct scroll_bar *, const Rect *));
-extern void mac_redraw_scroll_bar P_ ((struct scroll_bar *));
-#ifdef USE_TOOLKIT_SCROLL_BARS
-extern void x_set_toolkit_scroll_bar_thumb P_ ((struct scroll_bar *,
-                                                int, int, int));
-#else
-extern void x_scroll_bar_set_handle P_ ((scroll_bar *, int, int, int));
-#endif
-#if USE_MAC_FONT_PANEL
-extern int mac_font_panel_visible_p P_ ((void));
-extern OSStatus mac_show_hide_font_panel P_ ((void));
-extern OSStatus mac_set_font_info_for_selection P_ ((struct frame *, int, int));
-#endif
-#ifdef MAC_OSX
-extern Boolean mac_run_loop_run_once P_ ((EventTimeout));
-#endif
-#if USE_MAC_TOOLBAR
-extern void update_frame_tool_bar P_ ((FRAME_PTR f));
-extern void free_frame_tool_bar P_ ((FRAME_PTR f));
-#endif
-#if TARGET_API_MAC_CARBON
-extern void mac_show_hourglass P_ ((struct frame *));
-extern void mac_hide_hourglass P_ ((struct frame *));
-extern void mac_reposition_hourglass P_ ((struct frame *));
-extern Lisp_Object mac_file_dialog P_ ((Lisp_Object, Lisp_Object, Lisp_Object,
-                                        Lisp_Object, Lisp_Object));
-#endif
-extern void x_activate_menubar P_ ((struct frame *));
-extern void free_frame_menubar P_ ((struct frame *));
-extern void mac_fill_menubar P_ ((widget_value *, int));
-extern void create_and_show_popup_menu P_ ((FRAME_PTR, widget_value *,
-                                            int, int, int));
-#if TARGET_API_MAC_CARBON
-extern void create_and_show_dialog P_ ((FRAME_PTR, widget_value *));
-#else
-extern int mac_dialog P_ ((widget_value *));
-#endif
-extern OSStatus mac_get_selection_from_symbol P_ ((Lisp_Object, int,
-                                                   Selection *));
-extern int mac_valid_selection_target_p P_ ((Lisp_Object));
-extern OSStatus mac_clear_selection P_ ((Selection *));
-extern Lisp_Object mac_get_selection_ownership_info P_ ((Selection));
-extern int mac_valid_selection_value_p P_ ((Lisp_Object, Lisp_Object));
-extern OSStatus mac_put_selection_value P_ ((Selection, Lisp_Object,
-                                             Lisp_Object));
-extern int mac_selection_has_target_p P_ ((Selection, Lisp_Object));
-extern Lisp_Object mac_get_selection_value P_ ((Selection, Lisp_Object));
-extern Lisp_Object mac_get_selection_target_list P_ ((Selection));
-#if TARGET_API_MAC_CARBON
-extern Lisp_Object mac_dnd_default_known_types P_ ((void));
-#endif
-
-/* arch-tag: 6b4ca125-5bef-476d-8ee8-31ed808b7e79
-   (do not change this comment) */