From 5b983c944f66b55192c901ce3fa38fcce6ca21e3 Mon Sep 17 00:00:00 2001 From: Sascha Schumann Date: Sat, 4 Dec 1999 19:19:57 +0000 Subject: Clean up php3.*\.h files. The files itself are renamed, and references in all .*\.[ch] files were changed. There is a slight chance that my script missed a few changes, please correct them manually. --- ext/hyperwave/hw.c | 4 +- ext/hyperwave/php3_hyperwave.h | 166 ----------------------------------------- ext/hyperwave/php_hyperwave.h | 166 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 168 insertions(+), 168 deletions(-) delete mode 100644 ext/hyperwave/php3_hyperwave.h create mode 100644 ext/hyperwave/php_hyperwave.h (limited to 'ext/hyperwave') diff --git a/ext/hyperwave/hw.c b/ext/hyperwave/hw.c index be4f3adbb5..a40b7b45b2 100644 --- a/ext/hyperwave/hw.c +++ b/ext/hyperwave/hw.c @@ -26,7 +26,7 @@ #include "php.h" #include "php_globals.h" -#include "ext/standard/php3_standard.h" +#include "ext/standard/php_standard.h" #include "ext/standard/head.h" #include "ext/standard/info.h" #include "SAPI.h" @@ -40,7 +40,7 @@ #if HYPERWAVE #include "php_ini.h" -#include "php3_hyperwave.h" +#include "php_hyperwave.h" //hw_module php3_hw_module; diff --git a/ext/hyperwave/php3_hyperwave.h b/ext/hyperwave/php3_hyperwave.h deleted file mode 100644 index c7f04f32fb..0000000000 --- a/ext/hyperwave/php3_hyperwave.h +++ /dev/null @@ -1,166 +0,0 @@ -/* - +----------------------------------------------------------------------+ - | PHP HTML Embedded Scripting Language Version 3.0 | - +----------------------------------------------------------------------+ - | Copyright (c) 1997,1998 PHP Development Team (See Credits file) | - +----------------------------------------------------------------------+ - | This program is free software; you can redistribute it and/or modify | - | it under the terms of the GNU General Public License as published by | - | the Free Software Foundation; either version 2 of the License, or | - | (at your option) any later version. | - | | - | This program is distributed in the hope that it will be useful, | - | but WITHOUT ANY WARRANTY; without even the implied warranty of | - | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | - | GNU General Public License for more details. | - | | - | You should have received a copy of the GNU General Public License | - | along with this program; if not, write to the Free Software | - | Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | - +----------------------------------------------------------------------+ - | Authors: Rasmus Lerdorf | - +----------------------------------------------------------------------+ - */ - - -/* $Id$ */ - -#ifndef _HW_H -#define _HW_H - -#if COMPILE_DL -#undef HYPERWAVE -#define HYPERWAVE 1 -#endif - -#if WIN32||WINNT -#define PHP_HW_API __declspec(dllexport) -#else -#define PHP_HW_API -#endif - -#if HYPERWAVE -#ifndef DLEXPORT -#define DLEXPORT -#endif - -#ifdef ZTS -#include "TSRM.h" -#endif - -#include "hg_comm.h" - -extern php3_module_entry hw_module_entry; -#define hw_module_ptr &hw_module_entry - -typedef struct { - long default_link; - long default_port; - long num_links,num_persistent; - long max_links,max_persistent; - long allow_persistent; - int le_socketp, le_psocketp, le_document; -} php_hw_globals; - -#ifdef ZTS -# define HwSLS_D php_hw_globals *hw_globals -# define HwSLS_DC , HwSLS_D -# define HwSLS_C hw_globals -# define HwSLS_CC , HwSLS_C -# define HwSG(v) (hw_globals->v) -# define HwSLS_FETCH() php_hw_globals *hw_globals = ts_resource(hw_globals_id) -#else -# define HwSLS_D -# define HwSLS_DC -# define HwSLS_C -# define HwSLS_CC -# define HwSG(v) (hw_globals.v) -# define HwSLS_FETCH() -extern PHP_HW_API php_hw_globals hw_globals; -#endif - -//extern hw_module php3_hw_module; - -typedef struct { - int size; - char *data; - char *attributes; - char *bodytag; -} hw_document; - -extern hw_connection php3_hw_connection; - -extern PHP_MINIT_FUNCTION(hw); -extern PHP_MSHUTDOWN_FUNCTION(hw); -PHP_MINFO_FUNCTION(hw); - -PHP_FUNCTION(hw_connect); -PHP_FUNCTION(hw_pconnect); -PHP_FUNCTION(hw_close); -PHP_FUNCTION(hw_root); -PHP_FUNCTION(hw_info); -PHP_FUNCTION(hw_error); -PHP_FUNCTION(hw_errormsg); -PHP_FUNCTION(hw_mv); -PHP_FUNCTION(hw_cp); -PHP_FUNCTION(hw_deleteobject); -PHP_FUNCTION(hw_changeobject); -PHP_FUNCTION(hw_modifyobject); -PHP_FUNCTION(hw_getparents); -PHP_FUNCTION(hw_getparentsobj); -PHP_FUNCTION(hw_children); -PHP_FUNCTION(hw_childrenobj); -PHP_FUNCTION(hw_getchildcoll); -PHP_FUNCTION(hw_getchildcollobj); -PHP_FUNCTION(hw_getobject); -PHP_FUNCTION(hw_getandlock); -PHP_FUNCTION(hw_unlock); -PHP_FUNCTION(hw_gettext); -PHP_FUNCTION(hw_edittext); -PHP_FUNCTION(hw_getcgi); -PHP_FUNCTION(hw_getremote); -PHP_FUNCTION(hw_getremotechildren); -PHP_FUNCTION(hw_pipedocument); -PHP_FUNCTION(hw_pipecgi); -PHP_FUNCTION(hw_insertdocument); -PHP_FUNCTION(hw_docbyanchorobj); -PHP_FUNCTION(hw_docbyanchor); -PHP_FUNCTION(hw_getobjectbyquery); -PHP_FUNCTION(hw_getobjectbyqueryobj); -PHP_FUNCTION(hw_getobjectbyquerycoll); -PHP_FUNCTION(hw_getobjectbyquerycollobj); -PHP_FUNCTION(hw_getchilddoccoll); -PHP_FUNCTION(hw_getchilddoccollobj); -PHP_FUNCTION(hw_getanchors); -PHP_FUNCTION(hw_getanchorsobj); -PHP_FUNCTION(hw_getusername); -PHP_FUNCTION(hw_setlinkroot); -PHP_FUNCTION(hw_inscoll); -PHP_FUNCTION(hw_incollections); -PHP_FUNCTION(hw_insertobject); -PHP_FUNCTION(hw_insdoc); -PHP_FUNCTION(hw_identify); -PHP_FUNCTION(hw_free_document); -PHP_FUNCTION(hw_new_document); -PHP_FUNCTION(hw_output_document); -PHP_FUNCTION(hw_document_size); -PHP_FUNCTION(hw_document_attributes); -PHP_FUNCTION(hw_document_bodytag); -PHP_FUNCTION(hw_document_content); -PHP_FUNCTION(hw_document_setcontent); -PHP_FUNCTION(hw_objrec2array); -PHP_FUNCTION(hw_array2objrec); -PHP_FUNCTION(hw_connection_info); -PHP_FUNCTION(hw_getsrcbydestobj); -PHP_FUNCTION(hw_getrellink); -PHP_FUNCTION(hw_dummy); -PHP_FUNCTION(hw_who); -PHP_FUNCTION(hw_stat); -PHP_FUNCTION(hw_mapid); - -#else -#define hw_module_ptr NULL -#endif /* HYPERWAVE */ -#define phpext_hyperwave_ptr hw_module_ptr -#endif /* _HW_H */ - diff --git a/ext/hyperwave/php_hyperwave.h b/ext/hyperwave/php_hyperwave.h new file mode 100644 index 0000000000..c7f04f32fb --- /dev/null +++ b/ext/hyperwave/php_hyperwave.h @@ -0,0 +1,166 @@ +/* + +----------------------------------------------------------------------+ + | PHP HTML Embedded Scripting Language Version 3.0 | + +----------------------------------------------------------------------+ + | Copyright (c) 1997,1998 PHP Development Team (See Credits file) | + +----------------------------------------------------------------------+ + | This program is free software; you can redistribute it and/or modify | + | it under the terms of the GNU General Public License as published by | + | the Free Software Foundation; either version 2 of the License, or | + | (at your option) any later version. | + | | + | This program is distributed in the hope that it will be useful, | + | but WITHOUT ANY WARRANTY; without even the implied warranty of | + | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | + | GNU General Public License for more details. | + | | + | You should have received a copy of the GNU General Public License | + | along with this program; if not, write to the Free Software | + | Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | + +----------------------------------------------------------------------+ + | Authors: Rasmus Lerdorf | + +----------------------------------------------------------------------+ + */ + + +/* $Id$ */ + +#ifndef _HW_H +#define _HW_H + +#if COMPILE_DL +#undef HYPERWAVE +#define HYPERWAVE 1 +#endif + +#if WIN32||WINNT +#define PHP_HW_API __declspec(dllexport) +#else +#define PHP_HW_API +#endif + +#if HYPERWAVE +#ifndef DLEXPORT +#define DLEXPORT +#endif + +#ifdef ZTS +#include "TSRM.h" +#endif + +#include "hg_comm.h" + +extern php3_module_entry hw_module_entry; +#define hw_module_ptr &hw_module_entry + +typedef struct { + long default_link; + long default_port; + long num_links,num_persistent; + long max_links,max_persistent; + long allow_persistent; + int le_socketp, le_psocketp, le_document; +} php_hw_globals; + +#ifdef ZTS +# define HwSLS_D php_hw_globals *hw_globals +# define HwSLS_DC , HwSLS_D +# define HwSLS_C hw_globals +# define HwSLS_CC , HwSLS_C +# define HwSG(v) (hw_globals->v) +# define HwSLS_FETCH() php_hw_globals *hw_globals = ts_resource(hw_globals_id) +#else +# define HwSLS_D +# define HwSLS_DC +# define HwSLS_C +# define HwSLS_CC +# define HwSG(v) (hw_globals.v) +# define HwSLS_FETCH() +extern PHP_HW_API php_hw_globals hw_globals; +#endif + +//extern hw_module php3_hw_module; + +typedef struct { + int size; + char *data; + char *attributes; + char *bodytag; +} hw_document; + +extern hw_connection php3_hw_connection; + +extern PHP_MINIT_FUNCTION(hw); +extern PHP_MSHUTDOWN_FUNCTION(hw); +PHP_MINFO_FUNCTION(hw); + +PHP_FUNCTION(hw_connect); +PHP_FUNCTION(hw_pconnect); +PHP_FUNCTION(hw_close); +PHP_FUNCTION(hw_root); +PHP_FUNCTION(hw_info); +PHP_FUNCTION(hw_error); +PHP_FUNCTION(hw_errormsg); +PHP_FUNCTION(hw_mv); +PHP_FUNCTION(hw_cp); +PHP_FUNCTION(hw_deleteobject); +PHP_FUNCTION(hw_changeobject); +PHP_FUNCTION(hw_modifyobject); +PHP_FUNCTION(hw_getparents); +PHP_FUNCTION(hw_getparentsobj); +PHP_FUNCTION(hw_children); +PHP_FUNCTION(hw_childrenobj); +PHP_FUNCTION(hw_getchildcoll); +PHP_FUNCTION(hw_getchildcollobj); +PHP_FUNCTION(hw_getobject); +PHP_FUNCTION(hw_getandlock); +PHP_FUNCTION(hw_unlock); +PHP_FUNCTION(hw_gettext); +PHP_FUNCTION(hw_edittext); +PHP_FUNCTION(hw_getcgi); +PHP_FUNCTION(hw_getremote); +PHP_FUNCTION(hw_getremotechildren); +PHP_FUNCTION(hw_pipedocument); +PHP_FUNCTION(hw_pipecgi); +PHP_FUNCTION(hw_insertdocument); +PHP_FUNCTION(hw_docbyanchorobj); +PHP_FUNCTION(hw_docbyanchor); +PHP_FUNCTION(hw_getobjectbyquery); +PHP_FUNCTION(hw_getobjectbyqueryobj); +PHP_FUNCTION(hw_getobjectbyquerycoll); +PHP_FUNCTION(hw_getobjectbyquerycollobj); +PHP_FUNCTION(hw_getchilddoccoll); +PHP_FUNCTION(hw_getchilddoccollobj); +PHP_FUNCTION(hw_getanchors); +PHP_FUNCTION(hw_getanchorsobj); +PHP_FUNCTION(hw_getusername); +PHP_FUNCTION(hw_setlinkroot); +PHP_FUNCTION(hw_inscoll); +PHP_FUNCTION(hw_incollections); +PHP_FUNCTION(hw_insertobject); +PHP_FUNCTION(hw_insdoc); +PHP_FUNCTION(hw_identify); +PHP_FUNCTION(hw_free_document); +PHP_FUNCTION(hw_new_document); +PHP_FUNCTION(hw_output_document); +PHP_FUNCTION(hw_document_size); +PHP_FUNCTION(hw_document_attributes); +PHP_FUNCTION(hw_document_bodytag); +PHP_FUNCTION(hw_document_content); +PHP_FUNCTION(hw_document_setcontent); +PHP_FUNCTION(hw_objrec2array); +PHP_FUNCTION(hw_array2objrec); +PHP_FUNCTION(hw_connection_info); +PHP_FUNCTION(hw_getsrcbydestobj); +PHP_FUNCTION(hw_getrellink); +PHP_FUNCTION(hw_dummy); +PHP_FUNCTION(hw_who); +PHP_FUNCTION(hw_stat); +PHP_FUNCTION(hw_mapid); + +#else +#define hw_module_ptr NULL +#endif /* HYPERWAVE */ +#define phpext_hyperwave_ptr hw_module_ptr +#endif /* _HW_H */ + -- cgit v1.2.1