summaryrefslogtreecommitdiff
path: root/admin
diff options
context:
space:
mode:
Diffstat (limited to 'admin')
-rw-r--r--admin/ChangeLog5
-rwxr-xr-xadmin/merge-gnulib2
2 files changed, 6 insertions, 1 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog
index ef025c7630e..24f714eee8f 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,8 @@
+2014-03-07 Paul Eggert <eggert@cs.ucla.edu>
+
+ Fix oversight preventing lib/sys/types.h from being generated.
+ * merge-gnulib (GNULIB_TOOL_FLAGS): Don't avoid sys_types.
+
2014-02-06 David Engster <deng@randomsample.de>
* grammars/c.by (function-pointer): Correctly deal with anonymous
diff --git a/admin/merge-gnulib b/admin/merge-gnulib
index 75808d30b60..6c0dffb6dce 100755
--- a/admin/merge-gnulib
+++ b/admin/merge-gnulib
@@ -48,7 +48,7 @@ GNULIB_TOOL_FLAGS='
--avoid=malloc-posix --avoid=msvc-inval --avoid=msvc-nothrow
--avoid=open --avoid=openat-die --avoid=opendir
--avoid=raise
- --avoid=save-cwd --avoid=select --avoid=sigprocmask --avoid=sys_types
+ --avoid=save-cwd --avoid=select --avoid=sigprocmask
--avoid=threadlib
--conditional-dependencies --import --no-changelog --no-vc-files
--makefile-name=gnulib.mk