aboutsummaryrefslogtreecommitdiffstats
path: root/msdos
diff options
context:
space:
mode:
authorPaul Eggert <[email protected]>2012-10-04 00:15:42 -0700
committerPaul Eggert <[email protected]>2012-10-04 00:15:42 -0700
commitbb1dfdadd507bb4b77595c87875ef807c101ed7b (patch)
treeeb92a2335896c34e76a9e19362049396b8d0483f /msdos
parent88d69b7ddca305bb96d6e671300f6724e4f147dd (diff)
Merge from gnulib.
Diffstat (limited to 'msdos')
-rw-r--r--msdos/ChangeLog5
-rw-r--r--msdos/sedlibmk.inp1
2 files changed, 6 insertions, 0 deletions
diff --git a/msdos/ChangeLog b/msdos/ChangeLog
index 525868b2c7..d3d9bc657c 100644
--- a/msdos/ChangeLog
+++ b/msdos/ChangeLog
@@ -1,3 +1,8 @@
+2012-10-04 Paul Eggert <[email protected]>
+
+ Merge from gnulib.
+ * msdos/sedlibmk.inp (REPLACE_PTSNAME): Edit to appropriate value.
+
2012-09-27 Paul Eggert <[email protected]>
Check more robustly for timer_settime.
diff --git a/msdos/sedlibmk.inp b/msdos/sedlibmk.inp
index 67719cffbd..9879947ca4 100644
--- a/msdos/sedlibmk.inp
+++ b/msdos/sedlibmk.inp
@@ -541,6 +541,7 @@ am__cd = cd
/^REPLACE_PRINTF *=/s/@REPLACE_PRINTF@/0/
/^REPLACE_PTHREAD_SIGMASK *=/s/@REPLACE_PTHREAD_SIGMASK@/0/
/^REPLACE_PSELECT *=/s/@REPLACE_PSELECT@/0/
+/^REPLACE_PTSNAME *=/s/@REPLACE_PTSNAME@/0/
/^REPLACE_PTSNAME_R *=/s/@REPLACE_PTSNAME_R@/0/
/^REPLACE_PUTENV *=/s/@REPLACE_PUTENV@/0/
/^REPLACE_PWRITE *=/s/@REPLACE_PWRITE@/0/