diff options
Diffstat (limited to 'msdos')
| -rw-r--r-- | msdos/ChangeLog | 5 | ||||
| -rw-r--r-- | msdos/sedlibmk.inp | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/msdos/ChangeLog b/msdos/ChangeLog index 525868b2c70..d3d9bc657cc 100644 --- a/msdos/ChangeLog +++ b/msdos/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2012-10-04 Paul Eggert <eggert@cs.ucla.edu> | ||
| 2 | |||
| 3 | Merge from gnulib. | ||
| 4 | * msdos/sedlibmk.inp (REPLACE_PTSNAME): Edit to appropriate value. | ||
| 5 | |||
| 1 | 2012-09-27 Paul Eggert <eggert@cs.ucla.edu> | 6 | 2012-09-27 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 7 | ||
| 3 | Check more robustly for timer_settime. | 8 | Check more robustly for timer_settime. |
diff --git a/msdos/sedlibmk.inp b/msdos/sedlibmk.inp index 67719cffbd4..9879947ca45 100644 --- a/msdos/sedlibmk.inp +++ b/msdos/sedlibmk.inp | |||
| @@ -541,6 +541,7 @@ am__cd = cd | |||
| 541 | /^REPLACE_PRINTF *=/s/@REPLACE_PRINTF@/0/ | 541 | /^REPLACE_PRINTF *=/s/@REPLACE_PRINTF@/0/ |
| 542 | /^REPLACE_PTHREAD_SIGMASK *=/s/@REPLACE_PTHREAD_SIGMASK@/0/ | 542 | /^REPLACE_PTHREAD_SIGMASK *=/s/@REPLACE_PTHREAD_SIGMASK@/0/ |
| 543 | /^REPLACE_PSELECT *=/s/@REPLACE_PSELECT@/0/ | 543 | /^REPLACE_PSELECT *=/s/@REPLACE_PSELECT@/0/ |
| 544 | /^REPLACE_PTSNAME *=/s/@REPLACE_PTSNAME@/0/ | ||
| 544 | /^REPLACE_PTSNAME_R *=/s/@REPLACE_PTSNAME_R@/0/ | 545 | /^REPLACE_PTSNAME_R *=/s/@REPLACE_PTSNAME_R@/0/ |
| 545 | /^REPLACE_PUTENV *=/s/@REPLACE_PUTENV@/0/ | 546 | /^REPLACE_PUTENV *=/s/@REPLACE_PUTENV@/0/ |
| 546 | /^REPLACE_PWRITE *=/s/@REPLACE_PWRITE@/0/ | 547 | /^REPLACE_PWRITE *=/s/@REPLACE_PWRITE@/0/ |