upstream

3 files changed, 9 insertions, 8 deletions

diff --git a/admin/CPP-DEFINES b/admin/CPP-DEFINES
index d736f2354f7..c03bf6156ab 100644
--- a/admin/CPP-DEFINES
+++ b/admin/CPP-DEFINES
@@ -63,16 +63,11 @@ USER_FULL_NAME   If defined, overrides the default pw->pw_gecos for getting at t
 
 ** Replace, the definition is trivial: SWITCH_ENUM_CAST
 
-** Defines from src/m/*.h and src/s/*.h.  Some of these might not be used in the code anymore, so they can be removed.  The HAVE_* definitions are probably handled by autoconf, so it might be possible to just remove them from src/[sm]/*.h.
+** Defines from src/s/*.h.  Some of these might not be used in the code anymore, so they can be removed.  The HAVE_* definitions are probably handled by autoconf, so it might be possible to just remove them from src/s/*.h.
 
 
 AIX
 AMPERSAND_FULL_NAME
-BITS_PER_EMACS_INT
-BITS_PER_LONG
-BITS_PER_CHAR
-BITS_PER_SHORT
-BITS_PER_INT
 BROKEN_DATAGRAM_SOCKETS
 BROKEN_FIONREAD
 BROKEN_GET_CURRENT_DIR_NAME
diff --git a/admin/ChangeLog b/admin/ChangeLog
index 5ee31127006..c9e9d4a1acc 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,11 @@
+2012-05-22  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Remove src/m/*.
+        * CPP-DEFINES: Do not mention src/m/*.h.
+        (BITS_PER_EMACS_INT, BITS_PER_LONG, BITS_PER_CHAR)
+        (BITS_PER_SHORT, BITS_PER_INT): Remove.
+        * MAINTAINERS: Remove src/m/.
+
 2012-05-21  Paul Eggert  <eggert@cs.ucla.edu>
 
         Use full name for m4/gnulib-comp.m4.  (Bug#11529)
diff --git a/admin/MAINTAINERS b/admin/MAINTAINERS
index bfac347eb15..86d319d65d5 100644
--- a/admin/MAINTAINERS
+++ b/admin/MAINTAINERS
@@ -171,7 +171,6 @@ src/insdel.c
 src/image.c
 src/lastfile.c
 src/lread.c
-src/m/
 src/macros.c
 src/makefile.w32-in
 src/marker.c
@@ -220,4 +219,3 @@ src/xmenu.c
 src/xrdb.c
 src/xselect.c
 src/xterm.c
-