diff options
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/ChangeLog | 3 | ||||
| -rwxr-xr-x | admin/merge-gnulib | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog index deb3059f8d2..b9dc8cbafdc 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog | |||
| @@ -1,5 +1,8 @@ | |||
| 1 | 2013-07-09 Paul Eggert <eggert@cs.ucla.edu> | 1 | 2013-07-09 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 2 | ||
| 3 | Port recent close-on-exec changes to Cygwin (Bug#14821). | ||
| 4 | * merge-gnulib (GNULIB_TOOL_FLAGS): Don't avoid binary-io. | ||
| 5 | |||
| 3 | Handle error numbers a bit more reliably. | 6 | Handle error numbers a bit more reliably. |
| 4 | * merge-gnulib (GNULIB_MODULES): Remove ignore-value. | 7 | * merge-gnulib (GNULIB_MODULES): Remove ignore-value. |
| 5 | 8 | ||
diff --git a/admin/merge-gnulib b/admin/merge-gnulib index be4dfdd409c..82e0cd77fca 100755 --- a/admin/merge-gnulib +++ b/admin/merge-gnulib | |||
| @@ -41,7 +41,7 @@ GNULIB_MODULES=' | |||
| 41 | ' | 41 | ' |
| 42 | 42 | ||
| 43 | GNULIB_TOOL_FLAGS=' | 43 | GNULIB_TOOL_FLAGS=' |
| 44 | --avoid=binary-io --avoid=close --avoid=dup | 44 | --avoid=close --avoid=dup |
| 45 | --avoid=fchdir --avoid=fstat | 45 | --avoid=fchdir --avoid=fstat |
| 46 | --avoid=malloc-posix --avoid=msvc-inval --avoid=msvc-nothrow | 46 | --avoid=malloc-posix --avoid=msvc-inval --avoid=msvc-nothrow |
| 47 | --avoid=open --avoid=openat-die --avoid=opendir | 47 | --avoid=open --avoid=openat-die --avoid=opendir |