com php-src: use extra flag to turn on php implementations: main/php.h main/strlcat.c main/strlcpy.c
| From: | Anatol Belski | Date: | Sun, 19 Mar 2017 22:19:31 +0000 |
| Subject: | com php-src: use extra flag to turn on php implementations: main/php.h main/strlcat.c main/strlcpy.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-97351@lists.php.net to get a copy of this message | ||
Commit: 65afcf81a062cf5cc4a0a754ced6f6422e5537ad
Author: Anatol Belski <ab@php.net> Sun, 19 Mar 2017 23:19:31 +0100
Parents: 42821dd1c984574dde62d902a91ea58d2d83ecc6
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=65afcf81a062cf5cc4a0a754ced6f6422e5537ad
Log:
use extra flag to turn on php implementations
Changed paths:
M main/php.h
M main/strlcat.c
M main/strlcpy.c
Diff:
diff --git a/main/php.h b/main/php.h
index 5a5dd40..2d22297 100644
--- 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 a381b14..d3c8972 100644
--- 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 3e66140..548dd94 100644
--- 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 $ */