aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2015-04-02 23:45:21 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2015-04-02 23:45:32 +0000
commitbe69e0250002f998173bedb124c56b68ab6292cd (patch)
tree887216bcdbc20f7905563d065d85b04e99a1c2c2
parentd66cb74e4dca83a7719a1492586d3d82ad8ba9fa (diff)
parent039aba7f85d1384742e270a3a010a708130fa531 (diff)
downloadipsec-tools-master-soong.tar.gz
Merge "bionic has strlcat and strlcpy."android-wear-5.1.1_r1android-wear-5.1.0_r1android-m-preview-2android-m-preview-1android-m-previewandroid-cts-6.0_r9android-cts-6.0_r8android-cts-6.0_r7android-cts-6.0_r6android-cts-6.0_r5android-cts-6.0_r4android-cts-6.0_r32android-cts-6.0_r31android-cts-6.0_r30android-cts-6.0_r3android-cts-6.0_r29android-cts-6.0_r28android-cts-6.0_r27android-cts-6.0_r26android-cts-6.0_r25android-cts-6.0_r24android-cts-6.0_r23android-cts-6.0_r22android-cts-6.0_r21android-cts-6.0_r20android-cts-6.0_r2android-cts-6.0_r19android-cts-6.0_r18android-cts-6.0_r17android-cts-6.0_r16android-cts-6.0_r15android-cts-6.0_r14android-cts-6.0_r13android-cts-6.0_r12android-cts-6.0_r1android-6.0.1_r9android-6.0.1_r81android-6.0.1_r80android-6.0.1_r8android-6.0.1_r79android-6.0.1_r78android-6.0.1_r77android-6.0.1_r74android-6.0.1_r73android-6.0.1_r72android-6.0.1_r70android-6.0.1_r7android-6.0.1_r69android-6.0.1_r68android-6.0.1_r67android-6.0.1_r66android-6.0.1_r65android-6.0.1_r63android-6.0.1_r62android-6.0.1_r61android-6.0.1_r60android-6.0.1_r59android-6.0.1_r58android-6.0.1_r57android-6.0.1_r56android-6.0.1_r55android-6.0.1_r54android-6.0.1_r53android-6.0.1_r52android-6.0.1_r51android-6.0.1_r50android-6.0.1_r5android-6.0.1_r49android-6.0.1_r48android-6.0.1_r47android-6.0.1_r46android-6.0.1_r45android-6.0.1_r43android-6.0.1_r42android-6.0.1_r41android-6.0.1_r40android-6.0.1_r4android-6.0.1_r33android-6.0.1_r32android-6.0.1_r31android-6.0.1_r30android-6.0.1_r3android-6.0.1_r28android-6.0.1_r27android-6.0.1_r26android-6.0.1_r25android-6.0.1_r24android-6.0.1_r22android-6.0.1_r21android-6.0.1_r20android-6.0.1_r18android-6.0.1_r17android-6.0.1_r16android-6.0.1_r13android-6.0.1_r12android-6.0.1_r11android-6.0.1_r10android-6.0.1_r1android-6.0.0_r7android-6.0.0_r6android-6.0.0_r5android-6.0.0_r41android-6.0.0_r4android-6.0.0_r3android-6.0.0_r26android-6.0.0_r25android-6.0.0_r24android-6.0.0_r23android-6.0.0_r2android-6.0.0_r13android-6.0.0_r12android-6.0.0_r11android-6.0.0_r1master-soongmarshmallow-releasemarshmallow-mr3-releasemarshmallow-mr2-releasemarshmallow-mr1-releasemarshmallow-mr1-devmarshmallow-dr1.6-releasemarshmallow-dr1.5-releasemarshmallow-dr1.5-devmarshmallow-dr-releasemarshmallow-dr-dragon-releasemarshmallow-dr-devmarshmallow-devmarshmallow-cts-releaselinaro-android-6.0.1linaro-android-6.0
-rw-r--r--config.h15
1 files changed, 9 insertions, 6 deletions
diff --git a/config.h b/config.h
index 191c5da..2109136 100644
--- a/config.h
+++ b/config.h
@@ -6,21 +6,24 @@
#define ENABLE_DPD
#define ENABLE_HYBRID
-#define HAVE_OPENSSL_AES_H
+#define HAVE_OPENSSL_AES_H 1
#undef HAVE_OPENSSL_ENGINE_H
-#define WITH_SHA2
-#define HAVE_SHA2_IN_SHA_H
+#define WITH_SHA2 1
+#define HAVE_SHA2_IN_SHA_H 1
#undef INET6
#undef INET6_ADVAPI
#define PATH_IPSEC_H <netinet/ipsec.h>
-#define HAVE_POLICY_FWD
-#define HAVE_PFKEY_POLICY_PRIORITY
+#define HAVE_POLICY_FWD 1
+#define HAVE_PFKEY_POLICY_PRIORITY 1
#define TIME_WITH_SYS_TIME 1
#define HAVE_SYS_TIME_H 1
-#define HAVE_UNISTD_H
+#define HAVE_UNISTD_H 1
+
+#define HAVE_STRLCAT 1
+#define HAVE_STRLCPY 1
#define RETSIGTYPE void