cvs: pecl /hyperwave config.m4 hw.c php_hyperwave.h

steinm Fri Jul 25 02:43:11 2003 EDT Modified files: /pecl/hyperwave config.m4 hw.c php_hyperwave.h Log: - added HAVE_HYPERWAVE to disable extension, just in case somebody wants\n to compile this extension with php-src Index: pecl/hyperwave/config.m4 diff -u pecl/hyperwave/config.m4:1.5 pecl/hyperwave/config.m4:1.6 --- pecl/hyperwave/config.m4:1.5 Tue Jul 15 01:25:29 2003 +++ pecl/hyperwave/config.m4 Fri Jul 25 02:43:10 2003 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.5 2003/07/15 05:25:29 steinm Exp $ +dnl $Id: config.m4,v 1.6 2003/07/25 06:43:10 steinm Exp $ dnl PHP_ARG_ENABLE(hyperwave, whether to enable Hyperwave support, @@ -8,11 +8,13 @@ case "$PHP_HYPERWAVE" in yes) + AC_DEFINE(HAVE_HYPERWAVE,1,[ ]) PHP_NEW_EXTENSION(hyperwave, hw.c hg_comm.c, $ext_shared) ;; no) ;; *) + AC_DEFINE(HAVE_HYPERWAVE,1,[ ]) PHP_NEW_EXTENSION(hyperwave, hw.c hg_comm.c, $ext_shared) ;; esac Index: pecl/hyperwave/hw.c diff -u pecl/hyperwave/hw.c:1.125 pecl/hyperwave/hw.c:1.126 --- pecl/hyperwave/hw.c:1.125 Tue Jul 15 01:27:48 2003 +++ pecl/hyperwave/hw.c Fri Jul 25 02:43:10 2003 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: hw.c,v 1.125 2003/07/15 05:27:48 steinm Exp $ */ +/* $Id: hw.c,v 1.126 2003/07/25 06:43:10 steinm Exp $ */ #include <stdlib.h> #include <errno.h> @@ -32,12 +32,14 @@ #include "ext/standard/info.h" #include "fopen_wrappers.h" #include "SAPI.h" +#include "php_ini.h" #ifdef PHP_WIN32 #include <winsock2.h> #endif -#include "php_ini.h" +#if HAVE_HYPERWAVE + #include "php_hyperwave.h" static int le_socketp, le_psocketp, le_document; @@ -4059,6 +4061,7 @@ } fprintf(stdout, "\n\n"); } +#endif /* * Local variables: Index: pecl/hyperwave/php_hyperwave.h diff -u pecl/hyperwave/php_hyperwave.h:1.21 pecl/hyperwave/php_hyperwave.h:1.22 --- pecl/hyperwave/php_hyperwave.h:1.21 Tue Jul 15 11:10:18 2003 +++ pecl/hyperwave/php_hyperwave.h Fri Jul 25 02:43:10 2003 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_hyperwave.h,v 1.21 2003/07/15 15:10:18 steinm Exp $ */ +/* $Id: php_hyperwave.h,v 1.22 2003/07/25 06:43:10 steinm Exp $ */ #ifndef PHP_HYPERWAVE_H #define PHP_HYPERWAVE_H @@ -27,7 +27,7 @@ #define PHP_HW_API #endif -/* #if HYPERWAVE */ +#if HAVE_HYPERWAVE #ifndef DLEXPORT #define DLEXPORT @@ -139,10 +139,10 @@ PHP_FUNCTION(hw_stat); PHP_FUNCTION(hw_mapid); -/* + #else #define hw_module_ptr NULL -#endif */ /* HYPERWAVE */ +#endif /* HAVE_HYPERWAVE */ #define phpext_hyperwave_ptr hw_module_ptr #endif /* PHP_HYPERWAVE_H */