strongswan.org
Wiki/Project Management
Downloads
Gitweb
projects
/
strongswan.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ff96400
)
asn1: Undefine TIME_UTC, which is used by C11
author
Martin Willi
<martin@revosec.ch>
Wed, 8 Apr 2015 06:47:31 +0000
(08:47 +0200)
committer
Martin Willi
<martin@revosec.ch>
Wed, 8 Apr 2015 06:47:31 +0000
(08:47 +0200)
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.
src/libstrongswan/asn1/asn1.c
patch
|
blob
|
history
diff --git
a/src/libstrongswan/asn1/asn1.c
b/src/libstrongswan/asn1/asn1.c
index
dca12bd
..
37b89c6
100644
(file)
--- 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