Permalink
Browse files

@Fix warnings compiling in maintainer mode. (Stig)

Fix warnings compiling in maintainer mode.
Install DB/common.php and DB/mysql.php on "make install".
# We still have a warning from http_config.h:97.  Rasmus? :-)
  • Loading branch information...
1 parent 2aaece2 commit ae1b7bf4b8f211726d21bbf489bee78c8a3c4e2e Stig Bakken committed Dec 5, 1999
View
@@ -367,7 +367,7 @@ static void php_mysql_do_connect(INTERNAL_FUNCTION_PARAMETERS,int persistent)
#endif
char *user,*passwd,*host,*socket=NULL,*tmp;
char *hashed_details;
- int hashed_details_length,port;
+ int hashed_details_length,port = MYSQL_PORT;
MYSQL *mysql;
MySLS_FETCH();
PLS_FETCH();
View
@@ -51,6 +51,8 @@ PHP_FUNCTION(preg_split);
PHP_FUNCTION(preg_quote);
PHP_FUNCTION(preg_grep);
+char *_php_pcre_replace(char *regex, char *subject, char *replace);
+
extern zend_module_entry pcre_module_entry;
#define pcre_module_ptr &pcre_module_entry
@@ -118,7 +118,7 @@ PHP_FUNCTION(session_set_save_handler);
#define PS(v) (ps_globals->v)
#define PSLS_FETCH() php_ps_globals *ps_globals = ts_resource(ps_globals_id)
#else
-#define PSLS_D
+#define PSLS_D void
#define PSLS_DC
#define PSLS_C
#define PSLS_CC
@@ -153,6 +153,8 @@ void session_adapt_uris(const char *, uint, char **, uint *);
#define session_adapt_uris(a,b,c,d) do { } while(0)
#endif
+void _php_session_auto_start(void *data);
+
#if HAVE_WDDX
#define WDDX_SERIALIZER
#include "ext/wddx/php_wddx_api.h"
View
@@ -316,7 +316,7 @@ PS_SERIALIZER_DECODE_FUNC(wddx)
#endif
-static void php_session_track_init()
+static void php_session_track_init(void)
{
PSLS_FETCH();
ELS_FETCH();
View
@@ -93,7 +93,7 @@ typedef struct {
#define FG(v) (fsock_globals->v)
#define FLS_FETCH() php_fsock_globals *fsock_globals = ts_resource(fsock_globals_id)
#else
-#define FLS_D
+#define FLS_D void
#define FLS_DC
#define FLS_C
#define FLS_CC
View
@@ -77,6 +77,8 @@ PHP_FUNCTION(array_reverse);
PHP_FUNCTION(array_pad);
PHP_FUNCTION(array_flip);
+HashTable* _phpi_splice(HashTable *, int, int, zval ***, int, HashTable **);
+int multisort_compare(const void *a, const void *b);
#define phpext_array_ptr array_module_ptr
#endif /* _PHP_ARRAY_H */
@@ -21,6 +21,7 @@
#ifndef _php_metaphone_h
#define _php_metaphone_h
+char Lookahead(char *word, int how_far);
extern zend_module_entry metaphone_module_entry;
#define phpext_metaphone_ptr &metaphone_module_entry
View
4 main.h
@@ -32,8 +32,8 @@ PHPAPI int php_request_startup(CLS_D ELS_DC PLS_DC SLS_DC);
PHPAPI void php_request_shutdown(void *dummy);
PHPAPI void php_request_shutdown_for_exec(void *dummy);
PHPAPI int php_module_startup(sapi_module_struct *sf);
-PHPAPI void php_module_shutdown();
-PHPAPI void php_module_shutdown_for_exec();
+PHPAPI void php_module_shutdown(void);
+PHPAPI void php_module_shutdown_for_exec(void);
PHPAPI int php_module_shutdown_wrapper(sapi_module_struct *sapi_globals);
PHPAPI void php_execute_script(zend_file_handle *primary_file CLS_DC ELS_DC PLS_DC);
View
@@ -6,4 +6,6 @@ pear_DBdir=$(prefix)/lib/php/DB
install-data-local:
-$(mkinstalldirs) $(peardir) $(pear_DBdir) && \
$(INSTALL_DATA) $(srcdir)/DB.php $(peardir) && \
- $(INSTALL_DATA) $(srcdir)/DB/odbc.php $(pear_DBdir)
+ $(INSTALL_DATA) $(srcdir)/DB/common.php $(pear_DBdir) && \
+ $(INSTALL_DATA) $(srcdir)/DB/odbc.php $(pear_DBdir) && \
+ $(INSTALL_DATA) $(srcdir)/DB/mysql.php $(pear_DBdir)

0 comments on commit ae1b7bf

Please sign in to comment.