From: Nuno Lopes <nlopess@php.net>
Date: Thu, 3 Jan 2008 16:18:29 +0000 (+0000)
Subject: MFB: remove unused PHP_EXTNAME_API macros.
X-Git-Tag: RELEASE_2_0_0a1~1046
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1dc0e94e0f67aa3b602e0131f01cdc0ef6e0f48a;p=php

MFB: remove unused PHP_EXTNAME_API macros.
#in preparation for the gcc 4 visibility patch
---

diff --git a/ext/com_dotnet/php_com_dotnet.h b/ext/com_dotnet/php_com_dotnet.h
index b476f67e67..e65039952a 100644
--- a/ext/com_dotnet/php_com_dotnet.h
+++ b/ext/com_dotnet/php_com_dotnet.h
@@ -24,12 +24,6 @@
 extern zend_module_entry com_dotnet_module_entry;
 #define phpext_com_dotnet_ptr &com_dotnet_module_entry
 
-#ifdef PHP_WIN32
-# define PHP_COM_DOTNET_API __declspec(dllexport)
-#else
-# define PHP_COM_DOTNET_API
-#endif
-
 #ifdef ZTS
 #include "TSRM.h"
 #endif
diff --git a/ext/ctype/php_ctype.h b/ext/ctype/php_ctype.h
index c13c119353..1def292899 100644
--- a/ext/ctype/php_ctype.h
+++ b/ext/ctype/php_ctype.h
@@ -24,12 +24,6 @@
 extern zend_module_entry ctype_module_entry;
 #define phpext_ctype_ptr &ctype_module_entry
 
-#ifdef PHP_WIN32
-#define PHP_CTYPE_API __declspec(dllexport)
-#else
-#define PHP_CTYPE_API
-#endif
-
 #else
 
 #define phpext_ctype_ptr NULL
diff --git a/ext/filter/php_filter.h b/ext/filter/php_filter.h
index af8a4e674b..959089679b 100644
--- a/ext/filter/php_filter.h
+++ b/ext/filter/php_filter.h
@@ -33,12 +33,6 @@
 extern zend_module_entry filter_module_entry;
 #define phpext_filter_ptr &filter_module_entry
 
-#ifdef PHP_WIN32
-#define PHP_FILTER_API __declspec(dllexport)
-#else
-#define PHP_FILTER_API
-#endif
-
 #ifdef ZTS
 #include "TSRM.h"
 #endif
diff --git a/ext/gmp/php_gmp.h b/ext/gmp/php_gmp.h
index 9694314d44..2455f7128a 100644
--- a/ext/gmp/php_gmp.h
+++ b/ext/gmp/php_gmp.h
@@ -26,12 +26,6 @@
 extern zend_module_entry gmp_module_entry;
 #define phpext_gmp_ptr &gmp_module_entry
 
-#ifdef ZEND_WIN32
-#define GMP_API __declspec(dllexport)
-#else
-#define GMP_API
-#endif
-
 ZEND_MODULE_STARTUP_D(gmp);
 ZEND_MODULE_DEACTIVATE_D(gmp);
 ZEND_MODULE_INFO_D(gmp);
diff --git a/ext/json/php_json.h b/ext/json/php_json.h
index b7fcc56cd4..063ea046e7 100644
--- a/ext/json/php_json.h
+++ b/ext/json/php_json.h
@@ -26,12 +26,6 @@
 extern zend_module_entry json_module_entry;
 #define phpext_json_ptr &json_module_entry
 
-#ifdef PHP_WIN32
-#define PHP_JSON_API __declspec(dllexport)
-#else
-#define PHP_JSON_API
-#endif
-
 #ifdef ZTS
 #include "TSRM.h"
 #endif
diff --git a/ext/mime_magic/php_mime_magic.h b/ext/mime_magic/php_mime_magic.h
index 0b7bb86571..c7a11329a7 100644
--- a/ext/mime_magic/php_mime_magic.h
+++ b/ext/mime_magic/php_mime_magic.h
@@ -24,12 +24,6 @@
 extern zend_module_entry mime_magic_module_entry;
 #define phpext_mime_magic_ptr &mime_magic_module_entry
 
-#ifdef PHP_WIN32
-#define PHP_MIME_MAGIC_API __declspec(dllexport)
-#else
-#define PHP_MIME_MAGIC_API
-#endif
-
 PHP_MINIT_FUNCTION(mime_magic);
 PHP_MSHUTDOWN_FUNCTION(mime_magic);
 PHP_RINIT_FUNCTION(mime_magic);
diff --git a/ext/mssql/php_mssql.h b/ext/mssql/php_mssql.h
index dd6ff64552..3565d604bf 100644
--- a/ext/mssql/php_mssql.h
+++ b/ext/mssql/php_mssql.h
@@ -25,11 +25,6 @@
 
 #if HAVE_MSSQL
 #define MSDBLIB
-#ifdef PHP_WIN32
-#define PHP_MSSQL_API __declspec(dllexport)
-#else
-#define PHP_MSSQL_API
-#endif
 
 #include <sqlfront.h>
 #include <sqldb.h>
diff --git a/ext/oci8/php_oci8.h b/ext/oci8/php_oci8.h
index 3dbdc65eae..80301773b2 100644
--- a/ext/oci8/php_oci8.h
+++ b/ext/oci8/php_oci8.h
@@ -31,12 +31,6 @@
 # ifndef PHP_OCI8_H
 #  define PHP_OCI8_H
 
-#ifdef PHP_WIN32
-#define PHP_OCI_API __declspec(dllexport)
-#else
-#define PHP_OCI_API
-#endif                                   
-
 #ifdef ZTS
 # include "TSRM.h"
 #endif
diff --git a/ext/pcntl/php_pcntl.h b/ext/pcntl/php_pcntl.h
index dfa0d5d415..f7e5efe9fd 100644
--- a/ext/pcntl/php_pcntl.h
+++ b/ext/pcntl/php_pcntl.h
@@ -27,12 +27,6 @@
 extern zend_module_entry pcntl_module_entry;
 #define phpext_pcntl_ptr &pcntl_module_entry
 
-#ifdef PHP_WIN32
-#define PHP_PCNTL_API __declspec(dllexport)
-#else
-#define PHP_PCNTL_API
-#endif
-
 PHP_MINIT_FUNCTION(pcntl);
 PHP_MSHUTDOWN_FUNCTION(pcntl);
 PHP_RINIT_FUNCTION(pcntl);
diff --git a/ext/pdo_dblib/php_pdo_dblib.h b/ext/pdo_dblib/php_pdo_dblib.h
index a4ada9d799..6e490ea606 100644
--- a/ext/pdo_dblib/php_pdo_dblib.h
+++ b/ext/pdo_dblib/php_pdo_dblib.h
@@ -26,12 +26,6 @@
 extern zend_module_entry pdo_dblib_module_entry;
 #define phpext_pdo_dblib_ptr &pdo_dblib_module_entry
 
-#ifdef PHP_WIN32
-# define PHP_PDO_DBLIB_API __declspec(dllexport)
-#else
-# define PHP_PDO_DBLIB_API
-#endif
-
 #ifdef ZTS
 # include "TSRM.h"
 #endif
diff --git a/ext/pdo_firebird/php_pdo_firebird.h b/ext/pdo_firebird/php_pdo_firebird.h
index 0cbcd46936..f3e4092fd6 100644
--- a/ext/pdo_firebird/php_pdo_firebird.h
+++ b/ext/pdo_firebird/php_pdo_firebird.h
@@ -24,18 +24,6 @@
 extern zend_module_entry pdo_firebird_module_entry;
 #define phpext_pdo_firebird_ptr &pdo_firebird_module_entry
 
-#ifdef PHP_WIN32
-# ifdef PDO_FIREBIRD_EXPORTS
-#  define PDO_FB_API __declspec(dllexport)
-# elif defined(COMPILE_DL_PDO_FIREBIRD)
-#  define PDO_FB_API __declspec(dllimport)
-# else
-#  define PDO_FB_API
-# endif
-#else
-# define PDO_FB_API
-#endif
-
 #ifdef ZTS
 #include "TSRM.h"
 #endif
diff --git a/ext/pdo_mysql/php_pdo_mysql.h b/ext/pdo_mysql/php_pdo_mysql.h
index f3f09325be..8a9922f10f 100755
--- a/ext/pdo_mysql/php_pdo_mysql.h
+++ b/ext/pdo_mysql/php_pdo_mysql.h
@@ -24,12 +24,6 @@
 extern zend_module_entry pdo_mysql_module_entry;
 #define phpext_pdo_mysql_ptr &pdo_mysql_module_entry
 
-#ifdef PHP_WIN32
-#define PHP_PDO_MYSQL_API __declspec(dllexport)
-#else
-#define PHP_PDO_MYSQL_API
-#endif
-
 #ifdef ZTS
 #include "TSRM.h"
 #endif
diff --git a/ext/pdo_oci/php_pdo_oci.h b/ext/pdo_oci/php_pdo_oci.h
index 637f0b0861..6c563a5b36 100755
--- a/ext/pdo_oci/php_pdo_oci.h
+++ b/ext/pdo_oci/php_pdo_oci.h
@@ -24,12 +24,6 @@
 extern zend_module_entry pdo_oci_module_entry;
 #define phpext_pdo_oci_ptr &pdo_oci_module_entry
 
-#ifdef PHP_WIN32
-#define PHP_PDO_OCI_API __declspec(dllexport)
-#else
-#define PHP_PDO_OCI_API
-#endif
-
 #ifdef ZTS
 #include "TSRM.h"
 #endif
diff --git a/ext/pdo_odbc/php_pdo_odbc.h b/ext/pdo_odbc/php_pdo_odbc.h
index f44a75b2ee..ce5106c808 100644
--- a/ext/pdo_odbc/php_pdo_odbc.h
+++ b/ext/pdo_odbc/php_pdo_odbc.h
@@ -24,12 +24,6 @@
 extern zend_module_entry pdo_odbc_module_entry;
 #define phpext_pdo_odbc_ptr &pdo_odbc_module_entry
 
-#ifdef PHP_WIN32
-#define PHP_PDO_ODBC_API __declspec(dllexport)
-#else
-#define PHP_PDO_ODBC_API
-#endif
-
 #ifdef ZTS
 #include "TSRM.h"
 #endif
diff --git a/ext/pdo_pgsql/php_pdo_pgsql.h b/ext/pdo_pgsql/php_pdo_pgsql.h
index ac1d91d691..dda7b8794c 100644
--- a/ext/pdo_pgsql/php_pdo_pgsql.h
+++ b/ext/pdo_pgsql/php_pdo_pgsql.h
@@ -26,12 +26,6 @@
 extern zend_module_entry pdo_pgsql_module_entry;
 #define phpext_pdo_pgsql_ptr &pdo_pgsql_module_entry
 
-#ifdef PHP_WIN32
-#define PHP_PDO_PGSQL_API __declspec(dllexport)
-#else
-#define PHP_PDO_PGSQL_API
-#endif
-
 #ifdef ZTS
 #include "TSRM.h"
 #endif
diff --git a/ext/pdo_sqlite/php_pdo_sqlite.h b/ext/pdo_sqlite/php_pdo_sqlite.h
index 4a7bfa9de8..90811c9a0f 100644
--- a/ext/pdo_sqlite/php_pdo_sqlite.h
+++ b/ext/pdo_sqlite/php_pdo_sqlite.h
@@ -25,12 +25,6 @@
 extern zend_module_entry pdo_sqlite_module_entry;
 #define phpext_pdo_sqlite_ptr &pdo_sqlite_module_entry
 
-#ifdef PHP_WIN32
-#define PHP_PDO_SQLITE_API __declspec(dllexport)
-#else
-#define PHP_PDO_SQLITE_API
-#endif
-
 #ifdef ZTS
 #include "TSRM.h"
 #endif
diff --git a/ext/shmop/php_shmop.h b/ext/shmop/php_shmop.h
index 53b27d5c38..ad2437d30a 100644
--- a/ext/shmop/php_shmop.h
+++ b/ext/shmop/php_shmop.h
@@ -24,12 +24,6 @@
 extern zend_module_entry shmop_module_entry;
 #define phpext_shmop_ptr &shmop_module_entry
 
-#ifdef PHP_WIN32
-#define PHP_SHMOP_API __declspec(dllexport)
-#else
-#define PHP_SHMOP_API
-#endif
-
 PHP_MINIT_FUNCTION(shmop);
 PHP_MINFO_FUNCTION(shmop);
 
diff --git a/ext/simplexml/php_simplexml.h b/ext/simplexml/php_simplexml.h
index b31a33f4a4..8d97e836c2 100644
--- a/ext/simplexml/php_simplexml.h
+++ b/ext/simplexml/php_simplexml.h
@@ -24,12 +24,6 @@
 extern zend_module_entry simplexml_module_entry;
 #define phpext_simplexml_ptr &simplexml_module_entry
 
-#ifdef PHP_WIN32
-#define PHP_SIMPLEXML_API __declspec(dllexport)
-#else
-#define PHP_SIMPLEXML_API
-#endif
-
 #ifdef ZTS
 #include "TSRM.h"
 #endif
diff --git a/ext/soap/php_soap.h b/ext/soap/php_soap.h
index ad15a014aa..decdf4e5ae 100644
--- a/ext/soap/php_soap.h
+++ b/ext/soap/php_soap.h
@@ -225,11 +225,6 @@ ZEND_BEGIN_MODULE_GLOBALS(soap)
 	HashTable *ref_map;
 ZEND_END_MODULE_GLOBALS(soap)
 
-#ifdef PHP_WIN32
-#define PHP_SOAP_API __declspec(dllexport)
-#else
-#define PHP_SOAP_API
-#endif
 #ifdef ZTS
 #include "TSRM.h"
 #endif
diff --git a/ext/sockets/php_sockets.h b/ext/sockets/php_sockets.h
index 49f75ebe43..7d6f9b0633 100644
--- a/ext/sockets/php_sockets.h
+++ b/ext/sockets/php_sockets.h
@@ -30,10 +30,8 @@ extern zend_module_entry sockets_module_entry;
 #define phpext_sockets_ptr &sockets_module_entry
 
 #ifdef PHP_WIN32
-#define PHP_SOCKETS_API __declspec(dllexport)
 #include <winsock.h>
 #else
-#define PHP_SOCKETS_API
 #if HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif
diff --git a/ext/sqlite/php_sqlite.h b/ext/sqlite/php_sqlite.h
index a01e47005a..686ee4af49 100644
--- a/ext/sqlite/php_sqlite.h
+++ b/ext/sqlite/php_sqlite.h
@@ -26,12 +26,6 @@
 extern zend_module_entry sqlite_module_entry;
 #define phpext_sqlite_ptr &sqlite_module_entry
 
-#ifdef PHP_WIN32
-#define PHP_SQLITE_API __declspec(dllexport)
-#else
-#define PHP_SQLITE_API
-#endif
-
 #ifdef ZTS
 #include "TSRM.h"
 #endif
diff --git a/ext/tokenizer/php_tokenizer.h b/ext/tokenizer/php_tokenizer.h
index 2a3b8c4a56..b3043bce84 100644
--- a/ext/tokenizer/php_tokenizer.h
+++ b/ext/tokenizer/php_tokenizer.h
@@ -24,12 +24,6 @@
 extern zend_module_entry tokenizer_module_entry;
 #define phpext_tokenizer_ptr &tokenizer_module_entry
 
-#ifdef PHP_WIN32
-#define PHP_TOKENIZER_API __declspec(dllexport)
-#else
-#define PHP_TOKENIZER_API
-#endif
-
 #ifdef ZTS
 #include "TSRM.h"
 #endif
diff --git a/ext/xml/php_xml.h b/ext/xml/php_xml.h
index d22f28de82..c3a80e552c 100644
--- a/ext/xml/php_xml.h
+++ b/ext/xml/php_xml.h
@@ -34,12 +34,6 @@ extern zend_module_entry xml_module_entry;
 
 #include "ext/xml/expat_compat.h"
 
-#ifdef PHP_WIN32
-#define PHP_XML_API __declspec(dllexport)
-#else
-#define PHP_XML_API
-#endif
-
 
 #ifdef XML_UNICODE
 #error "UTF-16 Unicode support not implemented!"
diff --git a/ext/xmlreader/php_xmlreader.h b/ext/xmlreader/php_xmlreader.h
index 9c48d68136..5026c505c3 100644
--- a/ext/xmlreader/php_xmlreader.h
+++ b/ext/xmlreader/php_xmlreader.h
@@ -24,12 +24,6 @@
 extern zend_module_entry xmlreader_module_entry;
 #define phpext_xmlreader_ptr &xmlreader_module_entry
 
-#ifdef PHP_WIN32
-#define PHP_XMLREADER_API __declspec(dllexport)
-#else
-#define PHP_XMLREADER_API
-#endif
-
 #ifdef ZTS
 #include "TSRM.h"
 #endif
diff --git a/ext/xmlrpc/php_xmlrpc.h b/ext/xmlrpc/php_xmlrpc.h
index 8650437e35..1850f6a945 100644
--- a/ext/xmlrpc/php_xmlrpc.h
+++ b/ext/xmlrpc/php_xmlrpc.h
@@ -61,12 +61,6 @@
 extern zend_module_entry xmlrpc_module_entry;
 #define phpext_xmlrpc_ptr &xmlrpc_module_entry
 
-#ifdef PHP_WIN32
-#define PHP_XMLRPC_API __declspec(dllexport)
-#else
-#define PHP_XMLRPC_API
-#endif
-
 PHP_MINIT_FUNCTION(xmlrpc);
 PHP_MINFO_FUNCTION(xmlrpc);
 
diff --git a/ext/xsl/php_xsl.h b/ext/xsl/php_xsl.h
index c539919f6f..9f0bd57db1 100644
--- a/ext/xsl/php_xsl.h
+++ b/ext/xsl/php_xsl.h
@@ -24,12 +24,6 @@
 extern zend_module_entry xsl_module_entry;
 #define phpext_xsl_ptr &xsl_module_entry
 
-#ifdef PHP_WIN32
-#define PHP_XSL_API __declspec(dllexport)
-#else
-#define PHP_XSL_API
-#endif
-
 #ifdef ZTS
 #include "TSRM.h"
 #endif