From: Martin Willi <martin@revosec.ch>
Date: Wed, 8 Apr 2015 06:47:31 +0000 (+0200)
Subject: asn1: Undefine TIME_UTC, which is used by C11
X-Git-Tag: 5.3.1dr1~34
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=12def59617ca3143e534dcdc070cca1c94509754;p=thirdparty%2Fstrongswan.git

asn1: Undefine TIME_UTC, which is used by C11

When building with C11 support, TIME_UTC is used for timespec_get() and
defined in <time.h>. Undefine TIME_UTC for our own internal use in asn1.c.
---

diff --git a/src/libstrongswan/asn1/asn1.c b/src/libstrongswan/asn1/asn1.c
index dca12bd545..37b89c61bd 100644
--- a/src/libstrongswan/asn1/asn1.c
+++ b/src/libstrongswan/asn1/asn1.c
@@ -913,6 +913,10 @@ static const asn1Object_t timeObjects[] = {
 	{ 0, "end opt",			ASN1_EOC,				ASN1_END			}, /* 3 */
 	{ 0, "exit",			ASN1_EOC,				ASN1_EXIT			}
 };
+#ifdef TIME_UTC
+/* used by C11 timespec_get(), <time.h> */
+# undef TIME_UTC
+#endif
 #define TIME_UTC			0
 #define TIME_GENERALIZED	2