From: Timo Sirainen <tss@iki.fi>
Date: Sun, 24 Jan 2010 23:02:27 +0000 (+0200)
Subject: Removed my_strptime().
X-Git-Tag: 2.0.beta2~40
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bff6afb9717f2ec7dafa20c4e2b7f00236ec7bfe;p=thirdparty%2Fdovecot%2Fcore.git

Removed my_strptime().
It was just causing problems and wasn't used anywhere after all.

--HG--
branch : HEAD
---

diff --git a/src/lib/compat.c b/src/lib/compat.c
index 0c9cc3f7ea..a1369cd69f 100644
--- a/src/lib/compat.c
+++ b/src/lib/compat.c
@@ -8,7 +8,6 @@
 #ifdef PREAD_WRAPPERS
 #  define _XOPEN_SOURCE 500 /* Linux */
 #endif
-#include <time.h> /* strptime() is giving trouble if this is moved below.. */
 
 #define IN_COMPAT_C
 #include "lib.h"
@@ -309,9 +308,3 @@ int i_my_clock_gettime(int clk_id, struct timespec *tp)
 	return 0;
 }
 #endif
-
-#undef strptime
-char *my_strptime(const char *s, const char *format, struct tm *tm)
-{
-	return strptime(s, format, tm);
-}
diff --git a/src/lib/compat.h b/src/lib/compat.h
index 6e47c73a2a..7623b109c6 100644
--- a/src/lib/compat.h
+++ b/src/lib/compat.h
@@ -207,12 +207,6 @@ int i_my_vsnprintf(char *str, size_t size, const char *format, va_list ap);
 int i_my_clock_gettime(int clk_id, struct timespec *tp);
 #endif
 
-/* glibc wants _XOPEN_SOURCE defined for strptime(), but doing that breaks
-   other things. So we'll create this wrapper to work around the problems. */
-#define strptime my_strptime
-struct tm;
-char *my_strptime(const char *s, const char *format, struct tm *tm);
-
 /* ctype.h isn't safe with signed chars,
    use our own instead if really needed */
 #define i_toupper(x) ((char) toupper((int) (unsigned char) (x)))