Update of /usr/cvsroot/asterisk/stdtime
In directory mongoose.digium.com:/tmp/cvs-serv15988/stdtime
Modified Files:
localtime.c
Log Message:
issue #5569 minus lock.h changes
Index: localtime.c
===================================================================
RCS file: /usr/cvsroot/asterisk/stdtime/localtime.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- localtime.c 6 Nov 2005 15:09:47 -0000 1.15
+++ localtime.c 8 Nov 2005 04:13:19 -0000 1.16
@@ -77,6 +77,12 @@
#define OPEN_MODE O_RDONLY
#endif /* !defined O_BINARY */
+#ifdef SOLARIS
+#undef TM_ZONE
+#undef TM_GMTOFF
+#endif
+
+#ifdef TM_ZONE
#ifndef WILDABBR
/*! \note
* Someone might make incorrect use of a time zone abbreviation:
@@ -101,6 +107,7 @@
#endif /* !defined WILDABBR */
static char wildabbr[] = "WILDABBR";
+#endif /* TM_ZONE */
/*! \brief FreeBSD defines 'zone' in 'struct tm' as non-const, so don't
declare this
string as const. */
@@ -130,12 +137,6 @@
#define MY_TZNAME_MAX 255
#endif /* !defined TZNAME_MAX */
-#ifdef SOLARIS
-#undef TM_ZONE
-#undef TM_GMTOFF
-#endif
-
-
struct state {
char name[TZ_STRLEN_MAX + 1];
int leapcnt;
_______________________________________________
Asterisk-Cvs mailing list
[email protected]
http://lists.digium.com/mailman/listinfo/asterisk-cvs
