sockopts - fix for major_changed

allow both versions of major_changed after and before based on zmq version

Author: zebastian

options/sockopts_get.gsl

@@ -49,7 +49,15 @@ PHP_METHOD(zmqsocket, getsockopt)
 .-
 .            if php_type = "int"
 .-
+.               if defined (major_changed)
+# if ZMQ_VERSION_MAJOR < $(major_changed)
 	        SOCKOPTS_GET_INT($(NAME), $(c_type));
+# else
+	        SOCKOPTS_GET_INT($(NAME), $(c_type_new));
+# endif
+.               else
+	        SOCKOPTS_GET_INT($(NAME), $(c_type));
+.               endif
 .-
 .            elsif php_type = "string"
 .-

options/sockopts_preprocess.gsl

@@ -24,88 +24,49 @@ for version
             option.is_alias = "YES"
         endif
 
-       if defined (major_changed)
-            if type_new = "uint64" | type_new = "int64" | type_new = "uint32"
+        if type = "uint64" | type = "int64" | type = "uint32" | type = "int"
 
-                option.php_type = "int"
-                option.c_type   = "$(type_new)_t"
-                option.binary   = "no"
-
-            elsif type_new = "int"
-
-                option.php_type = "int"
-                option.c_type   = "$(type_new)"
-                option.binary   = "no"
-
-            elsif type_new = "string"
-
-                option.php_type   = "string"
-                option.c_type     = "char"
-                option.max_length = 255
-
-                if name = "subscribe" | name = "usubscribe" | name = "identity"
-                    option.binary = "yes"
-                else
-                    option.binary = "no"
+            option.php_type = "int"
+            option.c_type   = "$(type)_t"
+            if(option.c_type = "int_t")
+                option.c_type = "int"
+            endif
+            if defined (major_changed)
+                option.c_type_new = "$(type_new)_t"
+                if(option.c_type_new = "int_t")
+                    option.c_type_new = "int"
                 endif
+                option.major_changed = major_changed
+            endif
+            option.binary   = "no"
 
-            elsif type_new = "key"
-
-                option.php_type   = "string"
-                option.c_type     = "char"
-                option.max_length = 32
-                option.binary     = "yes"
-
-            elsif type_new = "socket"
+        elsif type = "string"
 
-                option.php_type = "resource"
-                option.c_type   = "int"
-                option.binary   = "no"
+            option.php_type   = "string"
+            option.c_type     = "char"
+            option.max_length = 255
 
+            if name = "subscribe" | name = "usubscribe" | name = "identity"
+                option.binary = "yes"
             else
-                echo "ERROR: Unrecognised type: $(type_new)"
+                option.binary = "no"
             endif
-        else
-            if type = "uint64" | type = "int64" | type = "uint32"
 
-                option.php_type = "int"
-                option.c_type   = "$(type)_t"
-                option.binary   = "no"
+        elsif type = "key"
 
-            elsif type = "int"
+            option.php_type   = "string"
+            option.c_type     = "char"
+            option.max_length = 32
+            option.binary     = "yes"
 
-                option.php_type = "int"
-                option.c_type   = "$(type)"
-                option.binary   = "no"
+        elsif type = "socket"
 
-            elsif type = "string"
+            option.php_type = "resource"
+            option.c_type   = "int"
+            option.binary   = "no"
 
-                option.php_type   = "string"
-                option.c_type     = "char"
-                option.max_length = 255
-
-                if name = "subscribe" | name = "usubscribe" | name = "identity"
-                    option.binary = "yes"
-                else
-                    option.binary = "no"
-                endif
-
-            elsif type = "key"
-
-                option.php_type   = "string"
-                option.c_type     = "char"
-                option.max_length = 32
-                option.binary     = "yes"
-
-            elsif type = "socket"
-
-                option.php_type = "resource"
-                option.c_type   = "int"
-                option.binary   = "no"
-
-            else
-                echo "ERROR: Unrecognised type: $(type)"
-            endif
+        else
+            echo "ERROR: Unrecognised type: $(type)"
         endif
     endfor
 endfor

options/sockopts_set.gsl

@@ -87,7 +87,15 @@ PHP_METHOD(zmqsocket, setsockopt)
 .-
 .            if php_type = "int"
 .-
-                SOCKOPTS_SET_INT($(NAME), $(c_type))
+.               if defined (major_changed)
+# if ZMQ_VERSION_MAJOR < $(major_changed)
+			SOCKOPTS_SET_INT($(NAME), $(c_type))
+# else
+			SOCKOPTS_SET_INT($(NAME), $(c_type_new))
+# endif
+.               else
+			SOCKOPTS_SET_INT($(NAME), $(c_type))
+.               endif
 .-
 .            elsif php_type = "string"
 .-