* NEWS:

* src/lib/evil_time.c:
	* src/lib/evil_time.h:
	Do not declare and define localtime_r() if it's already defined.



SVN revision: 70155

legacy/evil/ChangeLog

@@ -1,3 +1,10 @@
+2012-04-12  Vincent Torri  <doursse at users dot sf dot net>
+
+	* NEWS:
+	* src/lib/evil_time.c:
+	* src/lib/evil_time.h:
+	Do not declare and define localtime_r() if it's already defined.
+
 2012-03-30  Vincent Torri  <doursse at users dot sf dot net>
 
 	* NEWS:

legacy/evil/NEWS

@@ -5,6 +5,7 @@ Evil NEWS - User visible changes.
 ** Add evil_path_is_absolute() API
 ** Add POSIX printf() family functions
 ** Add S_ISLNK macro
+** Do not declare and define localtime_r() if it's already defined
 
 * Evil 1.0:
 

legacy/evil/src/lib/evil_time.c

@@ -5,6 +5,7 @@
 #include "Evil.h"
 #include "evil_private.h"
 
+#ifndef localtime_r
 
 struct tm *
 localtime_r(const time_t *timep, struct tm *result)
@@ -31,6 +32,8 @@ localtime_r(const time_t *timep, struct tm *result)
    return result;
 }
 
+#endif /* localtime_r */
+
 #ifdef UNDER_CE
 
 void

legacy/evil/src/lib/evil_time.h

@@ -13,6 +13,8 @@
  */
 
 
+#ifndef localtime_r
+
 /**
  * @brief Convert the calendar time to broken-time representation in a
  * user supplied data.
@@ -33,6 +35,8 @@
  */
 EAPI struct tm *localtime_r(const time_t *timep, struct tm *result);
 
+#endif /* localtime_r */
+
 #ifdef UNDER_CE
 
 /**