merge with 1.9.2b

diff --git a/lib/getopt.c b/lib/getopt.c
index 7a4673b8d8db32e96c0449d8fccb507cb7446103..2f1e6d8d7a123027c25c1a141eacbc74b5c0026e 100644 (file)
--- a/lib/getopt.c
+++ b/lib/getopt.c
@@ -20,6 +20,14 @@
    along with this program; if not, write to the Free Software
    Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 \f
+/* 
+ * This tells Alpha OSF/1 not to define a getopt prototype in <stdio.h>.
+ * Ditto for AIX 3.2 and <stdlib.h>.
+ */
+#ifndef _NO_PROTO
+#define _NO_PROTO
+#endif
+
 #ifdef HAVE_CONFIG_H
 #if defined (emacs) || defined (CONFIG_BROKETS)
 /* We use <config.h> instead of "config.h" so that a compilation
@@ -39,11 +47,6 @@
 #endif
 #endif
 
-/* This tells Alpha OSF/1 not to define a getopt prototype in <stdio.h>.  */
-#ifndef _NO_PROTO
-#define _NO_PROTO
-#endif
-
 #include <stdio.h>
 
 /* Comment out all this code if we are using the GNU C Library, and are not

diff --git a/lib/strftime.c b/lib/strftime.c
index 2fe309eae3e96c0b9b9f1ad17b30330e8784f964..6d8ca0c53e8b57995a32fa5ea06533a048bcd90e 100644 (file)
--- a/lib/strftime.c
+++ b/lib/strftime.c
@@ -36,7 +36,6 @@
    Numeric modifiers (a nonstandard extension):
    -   do not pad the field
    _   pad the field with spaces
-   %s   time in seconds since 00:00:00, Jan 1, 1970
 
    Time fields:
    %H  hour (00..23)
@@ -47,7 +46,7 @@
    %p  locale's AM or PM
    %r  time, 12-hour (hh:mm:ss [AP]M)
    %R  time, 24-hour (hh:mm)
-   %s   time in seconds since 00:00:00, Jan 1, 1970 (a nonstandard extension)
+   %s  time in seconds since 00:00:00, Jan 1, 1970 (a nonstandard extension)
    %S  second (00..61)
    %T  time, 24-hour (hh:mm:ss)
    %X  locale's time representation (%H:%M:%S)