Imported Debian patch 2.5.1-1

[debian/amanda] / common-src / strftime.c

diff --git a/common-src/strftime.c b/common-src/strftime.c
index fe0a497da451bff08e64f7336c09dcaacfc84292..c18098597569f5a65ef3500221fbbf18d38414bc 100644 (file)
--- a/common-src/strftime.c
+++ b/common-src/strftime.c
@@ -21,12 +21,8 @@
 static char sccsid[] = "@(#)strftime.c 5.8 (Berkeley) 6/1/90";
 #endif /* LIBC_SCCS and not lint */
 
-#include <sys/types.h>
-#include <sys/time.h>
-#ifndef        linux
-# include <tzfile.h>
-#endif /* linux */
-#include <string.h>
+#include "amanda.h"
+#include <tzfile.h>
 
 static char *afmt[] = {
        "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat",
@@ -237,7 +233,7 @@ _conv(n, digits, pad)
        static char buf[10];
        register char *p;
 
-       for (p = buf + sizeof(buf) - 2; n > 0 && p > buf; n /= 10, --digits)
+       for (p = buf + SIZEOF(buf) - 2; n > 0 && p > buf; n /= 10, --digits)
                *p-- = n % 10 + '0';
        while (p > buf && digits-- > 0)
                *p-- = pad;