Slightly modernize ext_skel and sekelton/

- .svnignore ->.gitignore
- Add .gitignore entries for DSO stand-alone builds stuff
- Docs don't use CVS but SVN
- reorder extname.c file so it needs less forward declarations
- take forward declarations out of php_extname.h
- Drop #if for 12 years old PHP version compatibility

3 files changed, 91 insertions, 73 deletions

diff --git a/ext/ext_skel b/ext/ext_skel
index 2492bf73da..061e78d649 100755
--- a/ext/ext_skel
+++ b/ext/ext_skel
@@ -12,7 +12,7 @@ echo ""
 echo "  --extname=module   module is the name of your extension"
 echo "  --proto=file       file contains prototypes of functions to create"
 echo "  --stubs=file       generate only function stubs in file"
-echo "  --xml              generate xml documentation to be added to phpdoc-cvs"
+echo "  --xml              generate xml documentation to be added to phpdoc-svn"
 echo "  --skel=dir         path to the skeleton directory"
 echo "  --full-xml         generate xml documentation for a self-contained extension"
 echo "                     (not yet implemented)"
@@ -187,11 +187,43 @@ if (PHP_$EXTNAME != "no") {
 
 eof
 
-$ECHO_N " .svnignore$ECHO_C"
-cat >.svnignore <<eof
+$ECHO_N " .gitignore$ECHO_C"
+cat >.gitignore <<eof
 .deps
 *.lo
 *.la
+.libs
+acinclude.m4
+aclocal.m4
+autom4te.cache
+build
+config.guess
+config.h
+config.h.in
+config.log
+config.nice
+config.status
+config.sub
+configure
+configure.in
+include
+install-sh
+libtool
+ltmain.sh
+Makefile
+Makefile.fragments
+Makefile.global
+Makefile.objects
+missing
+mkinstalldirs
+modules
+run-tests.php
+tests/*/*.diff
+tests/*/*.out
+tests/*/*.php
+tests/*/*.exp
+tests/*/*.log
+tests/*/*.sh
 eof
 
 $ECHO_N " $extname.c$ECHO_C"
diff --git a/ext/skeleton/php_skeleton.h b/ext/skeleton/php_skeleton.h
index 495907bbd1..86836c03e2 100644
--- a/ext/skeleton/php_skeleton.h
+++ b/ext/skeleton/php_skeleton.h
@@ -18,15 +18,6 @@ extern zend_module_entry extname_module_entry;
 #include "TSRM.h"
 #endif
 
-PHP_MINIT_FUNCTION(extname);
-PHP_MSHUTDOWN_FUNCTION(extname);
-PHP_RINIT_FUNCTION(extname);
-PHP_RSHUTDOWN_FUNCTION(extname);
-PHP_MINFO_FUNCTION(extname);
-
-PHP_FUNCTION(confirm_extname_compiled);	/* For testing, remove later. */
-/* __function_declarations_here__ */
-
 /* 
   	Declare any global variables you may need between the BEGIN
 	and END macros here:     
diff --git a/ext/skeleton/skeleton.c b/ext/skeleton/skeleton.c
index ee4ea74e16..b9a918806c 100644
--- a/ext/skeleton/skeleton.c
+++ b/ext/skeleton/skeleton.c
@@ -16,41 +16,6 @@ ZEND_DECLARE_MODULE_GLOBALS(extname)
 /* True global resources - no need for thread safety here */
 static int le_extname;
 
-/* {{{ extname_functions[]
- *
- * Every user visible function must have an entry in extname_functions[].
- */
-const zend_function_entry extname_functions[] = {
-	PHP_FE(confirm_extname_compiled,	NULL)		/* For testing, remove later. */
-	/* __function_entries_here__ */
-	PHP_FE_END	/* Must be the last line in extname_functions[] */
-};
-/* }}} */
-
-/* {{{ extname_module_entry
- */
-zend_module_entry extname_module_entry = {
-#if ZEND_MODULE_API_NO >= 20010901
-	STANDARD_MODULE_HEADER,
-#endif
-	"extname",
-	extname_functions,
-	PHP_MINIT(extname),
-	PHP_MSHUTDOWN(extname),
-	PHP_RINIT(extname),		/* Replace with NULL if there's nothing to do at request start */
-	PHP_RSHUTDOWN(extname),	/* Replace with NULL if there's nothing to do at request end */
-	PHP_MINFO(extname),
-#if ZEND_MODULE_API_NO >= 20010901
-	"0.1", /* Replace with version number for your extension */
-#endif
-	STANDARD_MODULE_PROPERTIES
-};
-/* }}} */
-
-#ifdef COMPILE_DL_EXTNAME
-ZEND_GET_MODULE(extname)
-#endif
-
 /* {{{ PHP_INI
  */
 /* Remove comments and fill if you need to have entries in php.ini
@@ -61,6 +26,35 @@ PHP_INI_END()
 */
 /* }}} */
 
+/* Remove the following function when you have successfully modified config.m4
+   so that your module can be compiled into PHP, it exists only for testing
+   purposes. */
+
+/* Every user-visible function in PHP should document itself in the source */
+/* {{{ proto string confirm_extname_compiled(string arg)
+   Return a string to confirm that the module is compiled in */
+PHP_FUNCTION(confirm_extname_compiled)
+{
+	char *arg = NULL;
+	int arg_len, len;
+	char *strg;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &arg, &arg_len) == FAILURE) {
+		return;
+	}
+
+	len = spprintf(&strg, 0, "Congratulations! You have successfully modified ext/%.78s/config.m4. Module %.78s is now compiled into PHP.", "extname", arg);
+	RETURN_STRINGL(strg, len, 0);
+}
+/* }}} */
+/* The previous line is meant for vim and emacs, so it can correctly fold and 
+   unfold functions in source code. See the corresponding marks just before 
+   function definition, where the functions purpose is also documented. Please 
+   follow this convention for the convenience of others editing your code.
+*/
+
+/* __function_stubs_here__ */
+
 /* {{{ php_extname_init_globals
  */
 /* Uncomment this function if you have INI entries
@@ -126,35 +120,36 @@ PHP_MINFO_FUNCTION(extname)
 }
 /* }}} */
 
+/* {{{ extname_functions[]
+ *
+ * Every user visible function must have an entry in extname_functions[].
+ */
+const zend_function_entry extname_functions[] = {
+	PHP_FE(confirm_extname_compiled,	NULL)		/* For testing, remove later. */
+	/* __function_entries_here__ */
+	PHP_FE_END	/* Must be the last line in extname_functions[] */
+};
+/* }}} */
 
-/* Remove the following function when you have successfully modified config.m4
-   so that your module can be compiled into PHP, it exists only for testing
-   purposes. */
-
-/* Every user-visible function in PHP should document itself in the source */
-/* {{{ proto string confirm_extname_compiled(string arg)
-   Return a string to confirm that the module is compiled in */
-PHP_FUNCTION(confirm_extname_compiled)
-{
-	char *arg = NULL;
-	int arg_len, len;
-	char *strg;
-
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &arg, &arg_len) == FAILURE) {
-		return;
-	}
-
-	len = spprintf(&strg, 0, "Congratulations! You have successfully modified ext/%.78s/config.m4. Module %.78s is now compiled into PHP.", "extname", arg);
-	RETURN_STRINGL(strg, len, 0);
-}
+/* {{{ extname_module_entry
+ */
+zend_module_entry extname_module_entry = {
+	STANDARD_MODULE_HEADER,
+	"extname",
+	extname_functions,
+	PHP_MINIT(extname),
+	PHP_MSHUTDOWN(extname),
+	PHP_RINIT(extname),		/* Replace with NULL if there's nothing to do at request start */
+	PHP_RSHUTDOWN(extname),	/* Replace with NULL if there's nothing to do at request end */
+	PHP_MINFO(extname),
+	"0.1", /* Replace with version number for your extension */
+	STANDARD_MODULE_PROPERTIES
+};
 /* }}} */
-/* The previous line is meant for vim and emacs, so it can correctly fold and 
-   unfold functions in source code. See the corresponding marks just before 
-   function definition, where the functions purpose is also documented. Please 
-   follow this convention for the convenience of others editing your code.
-*/
 
-/* __function_stubs_here__ */
+#ifdef COMPILE_DL_EXTNAME
+ZEND_GET_MODULE(extname)
+#endif
 
 /*
  * Local variables: