new consolidation functions must be added last or this will break binary compatibility

[rrdtool-all.git] / contrib / php4 / php_rrdtool.h

diff --git a/contrib/php4/php_rrdtool.h b/contrib/php4/php_rrdtool.h
index 7bc19983bc52101206fa7c91dc93ae18c3d516dd..cb8fd6a041e3e4a0c4fd8fe84b463e6322ce8fed 100644 (file)
--- a/contrib/php4/php_rrdtool.h
+++ b/contrib/php4/php_rrdtool.h
@@ -9,38 +9,61 @@
  *
  */
 
-#ifndef _PHP4_RRDTOOL_H
-#define _PHP4_RRDTOOL_H
+#ifndef _PHP_RRDTOOL_H
+#define _PHP_RRDTOOL_H
 
-#if COMPILE_DL
-#undef HAVE_RRDTOOL
-#define HAVE_RRDTOOL 1
+#ifdef HAVE_CONFIG_H
+#include "php_config.h"
 #endif
-#ifndef DLEXPORT
-#define DLEXPORT
+
+#ifdef PHP_WIN32
+#ifdef PHP_RRDTOOL_EXPORTS
+#define PHP_RRDTOOL_API __declspec(dllexport)
+#else
+#define PHP_RRDTOOL_API __declspec(dllimport)
+#endif
+#else
+#define PHP_RRDTOOL_API
 #endif
 
 #if HAVE_RRDTOOL
 
-PHP_MINFO_FUNCTION(rrdtool);
-
 extern zend_module_entry rrdtool_module_entry;
 #define rrdtool_module_ptr &rrdtool_module_entry
-#define phpext_rrdtool_ptr rrdtool_module_ptr
 
+#ifdef ZTS
+#include "TSRM.h"
+#endif
+
+#define RRDTOOL_LOGO_GUID              "PHP25B1F7E8-916B-11D9-9A54-000A95AE92DA"
+
+/* If you declare any globals in php_rrdtool.h uncomment this:
+ZEND_BEGIN_MODULE_GLOBALS(rrdtool)
+
+ZEND_END_MODULE_GLOBALS(rrdtool)
+ */
+
+PHP_MINIT_FUNCTION(rrdtool);
+PHP_MSHUTDOWN_FUNCTION(rrdtool);
+PHP_MINFO_FUNCTION(rrdtool);
+
+PHP_FUNCTION(rrd_graph);
+PHP_FUNCTION(rrd_fetch);
 PHP_FUNCTION(rrd_error);
 PHP_FUNCTION(rrd_clear_error);
 PHP_FUNCTION(rrd_update);
 PHP_FUNCTION(rrd_last);
 PHP_FUNCTION(rrd_create);
-PHP_FUNCTION(rrd_graph);
-PHP_FUNCTION(rrd_fetch);
+PHP_FUNCTION(rrdtool_info);
+PHP_FUNCTION(rrdtool_logo_guid);
 
 #else
 
-#define phpext_rrdtool_ptr NULL
+#define rrdtool_module_ptr NULL
 
 
 #endif /* HAVE_RRDTOOL */
 
-#endif  /* _PHP4_RRDTOOL_H */
+#define phpext_rrdtool_ptr rrdtool_module_ptr
+
+#endif  /* _PHP_RRDTOOL_H */