diff options
author | Darren Tucker <dtucker@dtucker.net> | 2019-07-16 09:20:23 +1000 |
---|---|---|
committer | Darren Tucker <dtucker@dtucker.net> | 2019-07-16 09:21:20 +1000 |
commit | 45478898f9590b5cc8bc7104e573b84be67443b0 (patch) | |
tree | a336573c93d4252ec4d03c1d4fba0356b5e72464 /openbsd-compat | |
parent | c7bd4617293a903bd3fac3394a7e72d439af49a5 (diff) |
Hook memmem compat code into build.
This fixes builds on platforms that don't have it (at least old DragonFly,
probably others).
Diffstat (limited to 'openbsd-compat')
-rw-r--r-- | openbsd-compat/Makefile.in | 1 | ||||
-rw-r--r-- | openbsd-compat/memmem.c | 5 | ||||
-rw-r--r-- | openbsd-compat/openbsd-compat.h | 4 |
3 files changed, 10 insertions, 0 deletions
diff --git a/openbsd-compat/Makefile.in b/openbsd-compat/Makefile.in index 2cc343636..1162dc550 100644 --- a/openbsd-compat/Makefile.in +++ b/openbsd-compat/Makefile.in | |||
@@ -34,6 +34,7 @@ OPENBSD=base64.o \ | |||
34 | inet_ntoa.o \ | 34 | inet_ntoa.o \ |
35 | inet_ntop.o \ | 35 | inet_ntop.o \ |
36 | md5.o \ | 36 | md5.o \ |
37 | memmem.o \ | ||
37 | mktemp.o \ | 38 | mktemp.o \ |
38 | pwcache.o \ | 39 | pwcache.o \ |
39 | readpassphrase.o \ | 40 | readpassphrase.o \ |
diff --git a/openbsd-compat/memmem.c b/openbsd-compat/memmem.c index 823443b08..3e5e6b5e6 100644 --- a/openbsd-compat/memmem.c +++ b/openbsd-compat/memmem.c | |||
@@ -27,6 +27,10 @@ | |||
27 | * SUCH DAMAGE. | 27 | * SUCH DAMAGE. |
28 | */ | 28 | */ |
29 | 29 | ||
30 | #include "includes.h" | ||
31 | |||
32 | #ifndef HAVE_MEMMEM | ||
33 | |||
30 | #include <string.h> | 34 | #include <string.h> |
31 | 35 | ||
32 | /* | 36 | /* |
@@ -62,3 +66,4 @@ memmem(const void *l, size_t l_len, const void *s, size_t s_len) | |||
62 | return NULL; | 66 | return NULL; |
63 | } | 67 | } |
64 | DEF_WEAK(memmem); | 68 | DEF_WEAK(memmem); |
69 | #endif /* HAVE_MEMMEM */ | ||
diff --git a/openbsd-compat/openbsd-compat.h b/openbsd-compat/openbsd-compat.h index 86d45317b..fda6706f8 100644 --- a/openbsd-compat/openbsd-compat.h +++ b/openbsd-compat/openbsd-compat.h | |||
@@ -73,6 +73,10 @@ int getpagesize(void); | |||
73 | char *getcwd(char *pt, size_t size); | 73 | char *getcwd(char *pt, size_t size); |
74 | #endif | 74 | #endif |
75 | 75 | ||
76 | #ifdef HAVE_MEMMEM | ||
77 | void *memmem(const void *, size_t, const void *, size_t); | ||
78 | #endif | ||
79 | |||
76 | #ifndef HAVE_REALLOCARRAY | 80 | #ifndef HAVE_REALLOCARRAY |
77 | void *reallocarray(void *, size_t, size_t); | 81 | void *reallocarray(void *, size_t, size_t); |
78 | #endif | 82 | #endif |