Merge from trunk

2 files changed, 5 insertions, 4 deletions

diff --git a/admin/CPP-DEFINES b/admin/CPP-DEFINES
index caf05a88ce5..a50a2ab6100 100644
--- a/admin/CPP-DEFINES
+++ b/admin/CPP-DEFINES
@@ -7,9 +7,7 @@ CYGWIN		Compiling the Cygwin port.
 __CYGWIN__      Ditto
 MSDOS           Compiling the MS-DOS port.
 __MSDOS__       Ditto.
-__DJGPP__       Major version number of the DJGPP library for the DOS port.
-__DJGPP_MINOR__ Minor version number of the DJGPP library.
-__GO32__        Compiling the DOS port with DJGPP v1.x (obsolete).
+__DJGPP_MINOR__ Minor version number of the DJGPP library; used only in msdos.c and dosfns.c.
 DOS_NT          Compiling for either the MS-DOS or native MS-Windows port.
 WINDOWSNT       Compiling the native MS-Windows (W32) port.
 __MINGW32__     Compiling the W32 port with the MinGW port of GCC.
@@ -236,7 +234,6 @@ LD_SWITCH_X_DEFAULT
 LIBS_MACHINE
 LIBS_SYSTEM
 LIBS_TERMCAP
-LIBX11_SYSTEM
 LIBXMU
 LIB_GCC
 LIB_MATH
diff --git a/admin/ChangeLog b/admin/ChangeLog
index 90ba61f7850..cf96d99d3b1 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,7 @@
+2010-04-01  Eli Zaretskii  <eliz@gnu.org>
+
+        * CPP-DEFINES (__DJGPP__, __GO32__): Remove, no longer used.
+
 2010-03-10  Chong Yidong  <cyd@stupidchicken.com>
 
         * Branch for 23.2.