Declare variables before calling functions. This makes tidy compile on Win32.

diff --git a/ext/tidy/tidy.c b/ext/tidy/tidy.c
index 844e3cbe383646a917a035a7a4191f44ba7778f2..a3468de1b5c4b1371f2d2a196364a3ff399fff9b 100644 (file)
--- a/ext/tidy/tidy.c
+++ b/ext/tidy/tidy.c
@@ -55,8 +55,8 @@
     object = TG(inst)
    
 #define TIDY_FETCH_OBJECT      \
-       TIDY_SET_CONTEXT; \
        PHPTidyObj *obj;        \
+       TIDY_SET_CONTEXT; \
        if (object) {   \
                if (ZEND_NUM_ARGS()) {  \
                        WRONG_PARAM_COUNT;      \
@@ -69,8 +69,8 @@
        obj = (PHPTidyObj *) zend_object_store_get_object(object TSRMLS_CC);    \
 
 #define TIDY_FETCH_ONLY_OBJECT \
-       TIDY_SET_CONTEXT; \
        PHPTidyObj *obj;        \
+       TIDY_SET_CONTEXT; \
        if (ZEND_NUM_ARGS()) {  \
                WRONG_PARAM_COUNT;      \
        }       \
@@ -1274,15 +1274,14 @@ PHP_FUNCTION(tidy_config_count)
 /* {{{ proto mixed tidy_getopt(string option)
    Returns the value of the specified configuration option for the tidy document. */
 PHP_FUNCTION(tidy_getopt)
-{
-       TIDY_SET_CONTEXT;
-    
+{  
        PHPTidyObj *obj;
        char *optname;
        void *optval;
        int optname_len;
        TidyOption opt;
        TidyOptionType optt;
+       TIDY_SET_CONTEXT;
 
        if (object) {
                if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &optname, &optname_len) == FAILURE) {
@@ -1337,9 +1336,8 @@ TIDY_DOC_METHOD(__construct)
        char *contents;
        zval *options = NULL;
        
-    TIDY_SET_CONTEXT;
-       
        PHPTidyObj *obj;
+    TIDY_SET_CONTEXT;  
        
        if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|szsb", &inputfile, &input_len,
                                                          &options, &enc, &enc_len, &use_include_path) == FAILURE) {