Make memmem impl usable from multiple places

by making 3rdparty/freebsd/memmem.c part of the objects lists and removing the implementation from the memmem header file
MoarVM · Aug 30, 2020 · 6366564 · 6366564
1 parent 489ab69
commit 6366564
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/3rdparty/freebsd/memmem.c b/3rdparty/freebsd/memmem.c
@@ -1,3 +1,4 @@
+#if defined(_WIN32) || defined(__APPLE__) || defined(__Darwin__) || defined(__sun)
 /*-
  * Copyright (c) 2005-2014 Rich Felker, et al.
  *
@@ -179,3 +180,4 @@ void *memmem(const void *h0, size_t k, const void *n0, size_t l)
 
 	return twoway_memmem(h, h+k, n, l);
 }
+#endif
diff --git a/build/Makefile.in b/build/Makefile.in
@@ -243,6 +243,7 @@ OBJECTS2 = src/6model/reprs/MVMDLLSym@obj@ \
           src/platform/sys@obj@ \
           src/platform/random@obj@ \
           src/platform/memmem32@obj@ \
+          3rdparty/freebsd/memmem@obj@ \
           src/platform/malloc_trim@obj@ \
           src/moar@obj@ \
           @platform@ \

diff --git a/src/platform/memmem.h b/src/platform/memmem.h
@@ -7,7 +7,7 @@
  * Solaris doesn't seem to have memmem                                        */
 
 #if defined(_WIN32) || defined(__APPLE__) || defined(__Darwin__) || defined(__sun)
-#include "../3rdparty/freebsd/memmem.c"
+void *memmem(const void *h0, size_t k, const void *n0, size_t l);
 #else
 /* On systems that use glibc, you must define _GNU_SOURCE before including string.h
  * to get access to memmem. */