Remove accidental semicolon and fix includes

Author: kocsismate

ext/snmp/php_snmp.h

@@ -92,7 +92,28 @@ ZEND_END_MODULE_GLOBALS(snmp)
 #define SNMP_G(v) (snmp_globals.v)
 #endif
 
-#define LONG_CONST(c) (zend_long) c;
+#define LONG_CONST(c) (zend_long) c
+
+#define SNMP_VALUE_LIBRARY	(0 << 0)
+#define SNMP_VALUE_PLAIN	(1 << 0)
+#define SNMP_VALUE_OBJECT	(1 << 1)
+
+#define PHP_SNMP_ERRNO_NOERROR			0
+#define PHP_SNMP_ERRNO_GENERIC			(1 << 1)
+#define PHP_SNMP_ERRNO_TIMEOUT			(1 << 2)
+#define PHP_SNMP_ERRNO_ERROR_IN_REPLY		(1 << 3)
+#define PHP_SNMP_ERRNO_OID_NOT_INCREASING	(1 << 4)
+#define PHP_SNMP_ERRNO_OID_PARSING_ERROR	(1 << 5)
+#define PHP_SNMP_ERRNO_MULTIPLE_SET_QUERIES	(1 << 6)
+#define PHP_SNMP_ERRNO_ANY	( \
+		PHP_SNMP_ERRNO_GENERIC | \
+		PHP_SNMP_ERRNO_TIMEOUT | \
+		PHP_SNMP_ERRNO_ERROR_IN_REPLY | \
+		PHP_SNMP_ERRNO_OID_NOT_INCREASING | \
+		PHP_SNMP_ERRNO_OID_PARSING_ERROR | \
+		PHP_SNMP_ERRNO_MULTIPLE_SET_QUERIES | \
+		PHP_SNMP_ERRNO_NOERROR \
+	)
 
 #else
 

ext/snmp/snmp.c

@@ -62,6 +62,8 @@
 #include <net-snmp/net-snmp-config.h>
 #include <net-snmp/net-snmp-includes.h>
 
+#include "snmp_arginfo.h"
+
 /* For net-snmp prior to 5.4 */
 #ifndef HAVE_SHUTDOWN_SNMP_LOGGING
 extern netsnmp_log_handler *logh_head;
@@ -73,12 +75,6 @@ extern netsnmp_log_handler *logh_head;
 	}
 #endif
 
-#define SNMP_VALUE_LIBRARY	(0 << 0)
-#define SNMP_VALUE_PLAIN	(1 << 0)
-#define SNMP_VALUE_OBJECT	(1 << 1)
-
-#include "snmp_arginfo.h"
-
 typedef struct snmp_session php_snmp_session;
 
 #define PHP_SNMP_ADD_PROPERTIES(a, b) \
@@ -91,23 +87,6 @@ typedef struct snmp_session php_snmp_session;
 	} \
 }
 
-#define PHP_SNMP_ERRNO_NOERROR			0
-#define PHP_SNMP_ERRNO_GENERIC			(1 << 1)
-#define PHP_SNMP_ERRNO_TIMEOUT			(1 << 2)
-#define PHP_SNMP_ERRNO_ERROR_IN_REPLY		(1 << 3)
-#define PHP_SNMP_ERRNO_OID_NOT_INCREASING	(1 << 4)
-#define PHP_SNMP_ERRNO_OID_PARSING_ERROR	(1 << 5)
-#define PHP_SNMP_ERRNO_MULTIPLE_SET_QUERIES	(1 << 6)
-#define PHP_SNMP_ERRNO_ANY	( \
-		PHP_SNMP_ERRNO_GENERIC | \
-		PHP_SNMP_ERRNO_TIMEOUT | \
-		PHP_SNMP_ERRNO_ERROR_IN_REPLY | \
-		PHP_SNMP_ERRNO_OID_NOT_INCREASING | \
-		PHP_SNMP_ERRNO_OID_PARSING_ERROR | \
-		PHP_SNMP_ERRNO_MULTIPLE_SET_QUERIES | \
-		PHP_SNMP_ERRNO_NOERROR \
-	)
-
 ZEND_DECLARE_MODULE_GLOBALS(snmp)
 static PHP_GINIT_FUNCTION(snmp);
 

ext/snmp/snmp.stub.php

@@ -56,7 +56,7 @@
 const SNMP_BIT_STR = UNKNOWN;
 /**
  * @var int
- * @cvalue LONG_CONST(ASN_OCTET_STRLONG_CONST)
+ * @cvalue LONG_CONST(ASN_OCTET_STR)
  */
 const SNMP_OCTET_STR = UNKNOWN;
 /**