aboutsummaryrefslogtreecommitdiffstats
path: root/admin
diff options
context:
space:
mode:
Diffstat (limited to 'admin')
-rw-r--r--admin/CPP-DEFINES2
-rw-r--r--admin/ChangeLog3
2 files changed, 3 insertions, 2 deletions
diff --git a/admin/CPP-DEFINES b/admin/CPP-DEFINES
index 71ba4bf8ece..d736f2354f7 100644
--- a/admin/CPP-DEFINES
+++ b/admin/CPP-DEFINES
@@ -201,7 +201,6 @@ NO_MATHERR
201NO_TERMIO 201NO_TERMIO
202NSIG 202NSIG
203NSIG_MINIMUM 203NSIG_MINIMUM
204NULL
205NULL_DEVICE 204NULL_DEVICE
206ORDINARY_LINK 205ORDINARY_LINK
207O_APPEND 206O_APPEND
@@ -272,7 +271,6 @@ chdir
272chmod 271chmod
273chown 272chown
274close 273close
275const
276creat 274creat
277ctime 275ctime
278dup 276dup
diff --git a/admin/ChangeLog b/admin/ChangeLog
index 86069da7f0b..1da647a803d 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,5 +1,8 @@
12012-05-21 Paul Eggert <eggert@cs.ucla.edu> 12012-05-21 Paul Eggert <eggert@cs.ucla.edu>
2 2
3 Assume C89 or later.
4 * CPP-DEFINES: Remove NULL, const.
5
3 Make merging from gnulib a script, not a makefile action. 6 Make merging from gnulib a script, not a makefile action.
4 * merge-gnulib: New script, with actions moved here from 7 * merge-gnulib: New script, with actions moved here from
5 ../Makefile.in. 8 ../Makefile.in.