summaryrefslogtreecommitdiff
path: root/ext/mysql/php_mysql.h
diff options
context:
space:
mode:
authorJani Taskinen <jani@php.net>2007-07-25 23:47:33 +0000
committerJani Taskinen <jani@php.net>2007-07-25 23:47:33 +0000
commitf3c2a33f4232b60b67e584ad94aeea3c3f8f7cf4 (patch)
tree4bef837b820227aafd16043ef700601588d9ac23 /ext/mysql/php_mysql.h
parente0849ab010c287912986698230cb02ef74bddfb8 (diff)
downloadphp-git-f3c2a33f4232b60b67e584ad94aeea3c3f8f7cf4.tar.gz
- Moved mysqnd to it's own directory: It is sort of an extension itself.
(Similar to what ext/libxml is..)
Diffstat (limited to 'ext/mysql/php_mysql.h')
-rw-r--r--ext/mysql/php_mysql.h11
1 files changed, 1 insertions, 10 deletions
diff --git a/ext/mysql/php_mysql.h b/ext/mysql/php_mysql.h
index 5f1123474f..ba906af333 100644
--- a/ext/mysql/php_mysql.h
+++ b/ext/mysql/php_mysql.h
@@ -16,7 +16,6 @@
+----------------------------------------------------------------------+
*/
-
/* $Id$ */
#ifndef PHP_MYSQL_H
@@ -42,12 +41,8 @@
#define FALSE 0
#endif
-#ifdef PHP_ATOM_INC
-#include "ext/mysql/php_have_mysqlnd.h" /* HAVE_MYSQLND is defined here if enabled */
-#endif
-
#if defined(HAVE_MYSQLND)
-#include "ext/mysqli/mysqlnd/mysqlnd.h"
+#include "ext/mysqlnd/mysqlnd.h"
#include "ext/mysql/mysql_mysqlnd.h"
#else
#include <mysql.h>
@@ -152,8 +147,4 @@ ZEND_END_MODULE_GLOBALS(mysql)
#define phpext_mysql_ptr mysql_module_ptr
-
-#include "ext/mysqli/mysqlnd/php_mysqlnd.h"
-
-
#endif /* PHP_MYSQL_H */