Merge lp:~sjinks/php-chuid/668608-0.3.6 into lp:~sjinks/php-chuid/0.3.6

[Volodymyr Kolesnykov]

* Port of 668608-0.3.5 to 0.3.6

[Volodymyr Kolesnykov (sjinks)]

Works for me

review: Approve

=== modified file 'chuid.c'
--- chuid.c	2010-10-07 06:59:43 +0000
+++ chuid.c	2010-10-30 02:46:47 +0000
@@ -1,7 +1,7 @@
 /**
  * @file
  * @author Vladimir Kolesnikov <[e-mail]>
- * @version 0.3.6.1
+ * @version 0.3.6.2
  * @brief PHP CHUID Module
  */
 
@@ -89,7 +89,7 @@
 	cap_value_t caps[4];
 
 #if !COMPILE_DL_CHUID
-	zend_extension extension = chuid_extension_entry;
+	zend_extension extension = XXX_EXTENSION_ENTRY;
 	extension.handle = NULL;
 	zend_llist_add_element(&zend_extensions, &extension);
 

=== modified file 'extension.c'
--- extension.c	2010-10-07 06:59:43 +0000
+++ extension.c	2010-10-30 02:46:47 +0000
@@ -1,7 +1,7 @@
 /**
  * @file
  * @author Vladimir Kolesnikov <[e-mail]>
- * @version 0.3.6.1
+ * @version 0.3.6.2
  * @brief Zend Extensions related stuff — implementation
  */
 
@@ -54,7 +54,7 @@
 #if COMPILE_DL_CHUID
 ZEND_DLEXPORT
 #endif
-zend_extension chuid_extension_entry = {
+zend_extension XXX_EXTENSION_ENTRY = {
 	PHP_CHUID_EXTNAME,
 	PHP_CHUID_EXTVER,
 	PHP_CHUID_AUTHOR,

=== modified file 'php_chuid.h'
--- php_chuid.h	2010-10-07 07:23:37 +0000
+++ php_chuid.h	2010-10-30 02:46:47 +0000
@@ -7,7 +7,7 @@
 /**
  * @file php_chuid.h
  * @author Vladimir Kolesnikov <[e-mail]>
- * @version 0.3.6.1
+ * @version 0.3.6.2
  * @brief Common include file
  */
 
@@ -18,10 +18,31 @@
 #ifndef PHP_CHUID_H
 #define PHP_CHUID_H
 
-#define PHP_CHUID_EXTNAME   "chuid"   /**< Internal extension name */
-#define PHP_CHUID_EXTVER    "0.3.6.1" /**< Extension version */
+/**
+ * @headerfile php_chuid.h
+ * @brief Internal extension name
+ */
+#define PHP_CHUID_EXTNAME   "chuid"
+
+/**
+ * @headerfile php_chuid.h
+ * @brief Extension version
+ */
+#define PHP_CHUID_EXTVER    "0.3.6.2"
+
+/**
+ * @headerfile php_chuid.h
+ */
 #define PHP_CHUID_AUTHOR    "Vladimir Kolesnikov"
+
+/**
+ * @headerfile php_chuid.h
+ */
 #define PHP_CHUID_URL       "http://blog.sjinks.pro/"
+
+/**
+ * @headerfile php_chuid.h
+ */
 #define PHP_CHUID_COPYRIGHT "Copyright (c) 2009-2010"
 
 #ifdef HAVE_CONFIG_H
@@ -44,6 +65,7 @@
 /**
  * @def CHUID_G(v)
  * @brief Provides thread safe acccess to the global @c v (stored in @c chuid_globals)
+ * @headerfile php_chuid.h
  */
 #ifdef ZTS
 #	include "TSRM.h"
@@ -55,6 +77,7 @@
 /**
  * @def PHPCHUID_VISIBILITY_HIDDEN
  * @brief Prevents the name from being exported outside the shared module
+ * @headerfile php_chuid.h
  */
 #ifdef DOXYGEN
 #	undef PHPCHUID_VISIBILITY_HIDDEN
@@ -68,6 +91,7 @@
 /**
  * @def PHPCHUID_ERROR(severity, format, ...)
  * @brief Convenience macro to report an error
+ * @headerfile php_chuid.h
  */
 #ifdef DEBUG
 #	define PHPCHUID_ERROR(severity, format, ...) \
@@ -88,12 +112,20 @@
  * This one is required by php/main/internal_functions.c when chuid is built statically
  *
  * @def phpext_chuid_ptr
+ * @headerfile php_chuid.h
  */
 #define phpext_chuid_ptr &chuid_module_entry
 
+/**
+ * @def XXX_EXTENSION_ENTRY
+ * @headerfile php_chuid.h
+ * @brief @c zend_extension variable name - must be @c zend_extension_entry for the dynamically loaded module and must be unqiue name for the compiled-in module
+ */
 #if COMPILE_DL_CHUID
-extern ZEND_DLEXPORT zend_extension chuid_extension_entry;
+#	define XXX_EXTENSION_ENTRY zend_extension_entry
+extern ZEND_DLEXPORT zend_extension zend_extension_entry;
 #else
+#	define XXX_EXTENSION_ENTRY chuid_extension_entry
 PHPCHUID_VISIBILITY_HIDDEN extern zend_extension chuid_extension_entry;
 #endif