use extra flag to turn on php implementations

diff --git a/main/php.h b/main/php.h
index 5a5dd4061717b221ae21c31ff03077d70655912a..2d22297d3acec62e5c07a2249d77bf8e29d52b39 100644 (file)
--- a/main/php.h
+++ b/main/php.h
@@ -182,6 +182,7 @@ END_EXTERN_C()
 #undef strlcpy
 #define strlcpy php_strlcpy
 #define HAVE_STRLCPY 1
+#define USE_STRLCPY_PHP_IMPL 1
 #endif
 
 #ifndef HAVE_STRLCAT
@@ -191,6 +192,7 @@ END_EXTERN_C()
 #undef strlcat
 #define strlcat php_strlcat
 #define HAVE_STRLCAT 1
+#define USE_STRLCAT_PHP_IMPL 1
 #endif
 
 #ifndef HAVE_EXPLICIT_BZERO

diff --git a/main/strlcat.c b/main/strlcat.c
index a381b1433c1a322e1177da9a9f3537855eac116a..d3c8972d68d0339a7bf21948312e38cffd825e73 100644 (file)
--- a/main/strlcat.c
+++ b/main/strlcat.c
@@ -20,7 +20,7 @@
 
 #include "php.h"
 
-#ifndef HAVE_STRLCAT
+#ifdef USE_STRLCAT_PHP_IMPL
 
 /*     $OpenBSD: strlcat.c,v 1.17 2016/10/14 18:19:04 dtucker Exp $    */
 

diff --git a/main/strlcpy.c b/main/strlcpy.c
index 3e66140ef615fec3a5f91c8054cdd688cc1ef3a2..548dd9410b2d987329065e48b6dd956ea17f1ab2 100644 (file)
--- a/main/strlcpy.c
+++ b/main/strlcpy.c
@@ -20,7 +20,7 @@
 
 #include "php.h"
 
-#ifndef HAVE_STRLCPY
+#ifdef USE_STRLCPY_PHP_IMPL
 
 /*     $OpenBSD: strlcpy.c,v 1.15 2016/10/16 17:37:39 dtucker Exp $    */