TSRM fix for ext_skel - probably more needed

diff --git a/README.EXT_SKEL b/README.EXT_SKEL
index a887a85e5f73005d603781108df6244016e0c341..79640f1560a7a5ce95822de6cef08e6589ed0883 100644 (file)
--- a/README.EXT_SKEL
+++ b/README.EXT_SKEL
@@ -128,8 +128,8 @@ CURRENT LIMITATIONS, BUGS AND OTHER ODDITIES
   It can't handle correctly, and probably never will, variable list of
   of arguments. (void foo(int bar [, ...])
 
-  Don't trust too much the generated code. It tries to be useful in most of
-  the situations you might encounter, but automatic code generating will never
+  Don't trust the generated code too much. It tries to be useful in most of
+  the situations you might encounter, but automatic code generation will never
   beat a programmer who knows the real situation at hand. ext_skel is generally
   best suited for quickly generating a wrapper for c-library functions you
   might want to have available in PHP too.
@@ -154,7 +154,7 @@ PHP_FUNCTION(my_drawtext)
        int argc;
        int image_id = -1;
        int font_id = -1;
-       ???LS_FETCH();
+       TSRMLS_FETCH();
 
        argc = ZEND_NUM_ARGS();
        if (argc < 5 || argc > 6 || zend_get_parameters_ex(argc, &image, &text, &font, &x, &y, &color) == FAILURE) {

diff --git a/ext/skeleton/create_stubs b/ext/skeleton/create_stubs
index df3d4a65e6f068553e685ebf273e425a2e9d410f..a4bed440f94f41167a3a43dd85256bbe4a282484 100755 (executable)
--- a/ext/skeleton/create_stubs
+++ b/ext/skeleton/create_stubs
@@ -272,7 +272,7 @@ END {
                        fetchargs = fetchargs ") == FAILURE)" closefetch "{\n\t\tZEND_WRONG_PARAM_COUNT();\n\t}\n"
                }
                if (assign_params) funcvals = ints doubles floats strings
-               if (resources) funcvals = funcvals "\t???LS_FETCH();\n"
+               if (resources) funcvals = funcvals "\tTSRMLS_FETCH();\n"
                if (useswitch[i]) {
                        if (check_argc_in_switch[i]) {
                                check_argc = "\t\tdefault:\n\t\t\tZEND_WRONG_PARAM_COUNT();\n"