commit bash-20140411 snapshot

diff --git a/CWRU/CWRU.chlog b/CWRU/CWRU.chlog
index 12ec2bb9f29ae9265c08445a2f6eba39139dfb5e..54a85f21618d46f5df2432d52078e8c7612701d8 100644 (file)
--- a/CWRU/CWRU.chlog
+++ b/CWRU/CWRU.chlog
@@ -6103,3 +6103,10 @@ execute_cmd.c
        - mkfmt: use decpoint() to get decimal point instead of unconditionally
          using `.'.  Fixes bug reported by Andrey Tataranovich
          <tataranovich@gmail.com> in debian bug 741669
+
+                                  4/10
+                                  ----
+lib/readline/rltypedefs.h
+       - add back old Function/VFunction/etc typedefs, since other packages
+         (python, samba) use them. Mark as deprecated using gcc and clang
+         attributes.  Report and fix from Max Horn <max@quendi.de>

diff --git a/lib/readline/histfile.c b/lib/readline/histfile.c
index bb7431567ec6950e12d47914973b10919ec0e67a..b7ae627d92bf49e483730234e71d012e0ca2e422 100644 (file)
--- a/lib/readline/histfile.c
+++ b/lib/readline/histfile.c
@@ -540,7 +540,7 @@ mmap_error:
       }
 
 #ifdef HISTORY_USE_MMAP
-    if (msync (buffer, buffer_size, 0) != 0 || munmap (buffer, buffer_size) != 0)
+    if (msync (buffer, buffer_size, MS_ASYNC) != 0 || munmap (buffer, buffer_size) != 0)
       rv = errno;
 #else
     if (write (file, buffer, buffer_size) < 0)

diff --git a/lib/readline/rltypedefs.h b/lib/readline/rltypedefs.h
index b113ee6e996ab013e87e32be7bdd1e2d3fd14901..f9f5cd3a5b64d8b1a64c6eeaf6c17ddba1f7e6ff 100644 (file)
--- a/lib/readline/rltypedefs.h
+++ b/lib/readline/rltypedefs.h
@@ -26,6 +26,25 @@
 extern "C" {
 #endif
 
+/* Old-style, attempt to mark as deprecated in some way people will notice. */
+
+#if !defined (_FUNCTION_DEF)
+#  define _FUNCTION_DEF
+
+#if defined(__GNUC__) || defined(__clang__)
+typedef int Function () __attribute__ ((deprecated));
+typedef void VFunction () __attribute__ ((deprecated));
+typedef char *CPFunction () __attribute__ ((deprecated));
+typedef char **CPPFunction () __attribute__ ((deprecated));
+#else
+typedef int Function ();
+typedef void VFunction ();
+typedef char *CPFunction ();
+typedef char **CPPFunction ();
+#endif
+
+#endif /* _FUNCTION_DEF */
+
 /* New style. */
 
 #if !defined (_RL_FUNCTION_TYPEDEF)

diff --git a/support/mk-takehome b/support/mk-takehome
index 419572df4a5b3d149acca24dc93a5a44d2ecc4c5..acfed57d2b2df761a7e50f7bff9d62c9d4421ef5 100755 (executable)
--- a/support/mk-takehome
+++ b/support/mk-takehome
@@ -7,6 +7,7 @@ FROOT=bash-$DATE
 DIR=$PARENT/$FROOT
 TARF=${FROOT}.tar
 SRC=/usr/homes/chet/src/bash/src
+REMHOST=jenna
 
 fflag= sflag= dflag=
 while getopts "dfsp:" opt
@@ -56,8 +57,6 @@ tar cvf ${TARF} $FROOT
 
 gzip -v ${TARF}
 
-REMHOST=z4
-
 if [ -n "$sflag" ]; then
        scp ${TARF}.gz ${REMHOST}:
 fi