aboutsummaryrefslogtreecommitdiffstats
path: root/admin
diff options
context:
space:
mode:
Diffstat (limited to 'admin')
-rw-r--r--admin/CPP-DEFINES5
-rw-r--r--admin/ChangeLog4
2 files changed, 8 insertions, 1 deletions
diff --git a/admin/CPP-DEFINES b/admin/CPP-DEFINES
index 82cb23d6ce8..9b8a54ace63 100644
--- a/admin/CPP-DEFINES
+++ b/admin/CPP-DEFINES
@@ -3,7 +3,6 @@ of their use. Feel free to add more macros and more categories.
3 3
4** Distinguishing OSes ** 4** Distinguishing OSes **
5 5
6MAC_OS Compiling for the `mac' window-system.
7MAC_OS8 Compiling for Mac OS Classic (v8 or v9). No longer supported, all code using it can be removed. 6MAC_OS8 Compiling for Mac OS Classic (v8 or v9). No longer supported, all code using it can be removed.
8MAC_OSX Compiling for Mac OS X. Not bare Darwin. 7MAC_OSX Compiling for Mac OS X. Not bare Darwin.
9CYGWIN Compiling the Cygwin port. 8CYGWIN Compiling the Cygwin port.
@@ -23,7 +22,11 @@ USE_LISP_UNION_TYPE Define it in lisp.h to make Lisp_Object be a union type inst
23** Distinguishing GUIs ** 22** Distinguishing GUIs **
24 23
25HAVE_NTGUI Use the native W32 GUI for windows, frames, menus&scrollbars. 24HAVE_NTGUI Use the native W32 GUI for windows, frames, menus&scrollbars.
25MAC_OS Compiling for the `mac' window-system.
26HAVE_CARBON Compile support for the Carbon GUI. Requires MAC_OS? 26HAVE_CARBON Compile support for the Carbon GUI. Requires MAC_OS?
27HAVE_NS Use the NeXT/OpenStep/Cocoa UI under Mac OS X or GNUstep.
28NS_IMPL_GNUSTEP Compile support for GNUSTEP implementation of NS GUI API.
29NS_IMPL_COCOA Compile support for Cocoa (Apple) implementation of NS GUI API.
27HAVE_X11 Compile support for the X11 GUI. 30HAVE_X11 Compile support for the X11 GUI.
28HAVE_X_WINDOWS Compile support for X Window system 31HAVE_X_WINDOWS Compile support for X Window system
29X11 ?? Makefile.in suggests it's equivalent to HAVE_X11 32X11 ?? Makefile.in suggests it's equivalent to HAVE_X11
diff --git a/admin/ChangeLog b/admin/ChangeLog
index 090f8c20890..f56344da46c 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,7 @@
12008-07-15 Adrian Robert <Adrian.B.Robert@gmail.com>
2
3 * CPP_DEFINES: Add NS port related defines.
4
12008-06-16 Glenn Morris <rgm@gnu.org> 52008-06-16 Glenn Morris <rgm@gnu.org>
2 6
3 * admin.el (set-version): Add doc/lispref/vol1.texi,vol2.texi, 7 * admin.el (set-version): Add doc/lispref/vol1.texi,vol2.texi,