com php-src: don't include smart_str.h in a too glo bal header, fixes #64718: ext/mysqlnd/m ysqlnd.c ext/mysqlnd/mysqlnd_structs.h
| From: | Johannes Schlüter | Date: | Tue, 30 Apr 2013 12:26:55 +0000 |
| Subject: | com php-src: don't include smart_str.h in a too glo bal header, fixes #64718: ext/mysqlnd/m ysqlnd.c ext/mysqlnd/mysqlnd_structs.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-72070@lists.php.net to get a copy of this message | ||
Commit: 062519ed4186d5f19a131a3a4c0e430a83dc0766
Author: Johannes Schlüter <johannes@php.net> Tue, 30 Apr 2013 14:26:55 +0200
Parents: 36b968ae96fed67c91f3ac785e56aec8d565795a
Branches: PHP-5.5 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=062519ed4186d5f19a131a3a4c0e430a83dc0766
Log:
don't include smart_str.h in a too global header, fixes #64718
Bugs:
https://bugs.php.net/64718
Changed paths:
M ext/mysqlnd/mysqlnd.c
M ext/mysqlnd/mysqlnd_structs.h
Diff:
diff --git a/ext/mysqlnd/mysqlnd.c b/ext/mysqlnd/mysqlnd.c
index ccd8af5..724876e 100644
--- a/ext/mysqlnd/mysqlnd.c
+++ b/ext/mysqlnd/mysqlnd.c
@@ -27,6 +27,7 @@
#include "mysqlnd_statistics.h"
#include "mysqlnd_charset.h"
#include "mysqlnd_debug..h"
+#include "ext/standard/php_smart_str.h"
/*
TODO :
diff --git a/ext/mysqlnd/mysqlnd_structs.h b/ext/mysqlnd/mysqlnd_structs.h
index 55775d9..99981f7 100644
--- a/ext/mysqlnd/mysqlnd_structs.h
+++ b/ext/mysqlnd/mysqlnd_structs.h
@@ -23,7 +23,7 @@
#ifndef MYSQLND_STRUCTS_H
#define MYSQLND_STRUCTS_H
-#include "ext/standard/php_smart_str..h"
+#include "ext/standard/php_smart_str_public.h"
#define MYSQLND_TYPEDEFED_METHODS