diff options
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/ChangeLog | 5 | ||||
| -rwxr-xr-x | admin/merge-gnulib | 2 |
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 @@ | |||
| 1 | 2014-03-07 Paul Eggert <eggert@cs.ucla.edu> | ||
| 2 | |||
| 3 | Fix oversight preventing lib/sys/types.h from being generated. | ||
| 4 | * merge-gnulib (GNULIB_TOOL_FLAGS): Don't avoid sys_types. | ||
| 5 | |||
| 1 | 2014-02-06 David Engster <deng@randomsample.de> | 6 | 2014-02-06 David Engster <deng@randomsample.de> |
| 2 | 7 | ||
| 3 | * grammars/c.by (function-pointer): Correctly deal with anonymous | 8 | * 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=' | |||
| 48 | --avoid=malloc-posix --avoid=msvc-inval --avoid=msvc-nothrow | 48 | --avoid=malloc-posix --avoid=msvc-inval --avoid=msvc-nothrow |
| 49 | --avoid=open --avoid=openat-die --avoid=opendir | 49 | --avoid=open --avoid=openat-die --avoid=opendir |
| 50 | --avoid=raise | 50 | --avoid=raise |
| 51 | --avoid=save-cwd --avoid=select --avoid=sigprocmask --avoid=sys_types | 51 | --avoid=save-cwd --avoid=select --avoid=sigprocmask |
| 52 | --avoid=threadlib | 52 | --avoid=threadlib |
| 53 | --conditional-dependencies --import --no-changelog --no-vc-files | 53 | --conditional-dependencies --import --no-changelog --no-vc-files |
| 54 | --makefile-name=gnulib.mk | 54 | --makefile-name=gnulib.mk |