Commit 8e6a5f98066 for php
commit 8e6a5f98066e78e8eab0ffc1fa2d7bc5f6e29d7e
Author: Gina Peter Banyard <girgias@php.net>
Date: Thu Sep 24 16:58:54 2026 +0100
Zend: define a zend_ini_scanner_mode enum
And use it in _zend_ini_scanner_globals struct
diff --git a/Zend/zend_globals.h b/Zend/zend_globals.h
index 07fb997e015..c3d1ce3c67a 100644
--- a/Zend/zend_globals.h
+++ b/Zend/zend_globals.h
@@ -38,6 +38,7 @@
#include "zend_multiply.h"
#include "zend_arena.h"
#include "zend_call_stack.h"
+#include "zend_ini_scanner.h"
#include "zend_max_execution_timer.h"
#include "zend_strtod.h"
#include "zend_lazy_objects.h"
@@ -363,8 +364,7 @@ struct _zend_ini_scanner_globals {
zend_string *filename;
uint32_t lineno;
- /* Modes are: ZEND_INI_SCANNER_NORMAL, ZEND_INI_SCANNER_RAW, ZEND_INI_SCANNER_TYPED */
- int scanner_mode;
+ zend_ini_scanner_mode scanner_mode;
};
typedef enum {
diff --git a/Zend/zend_ini_scanner.h b/Zend/zend_ini_scanner.h
index c013564a10f..4cdcf0472bb 100644
--- a/Zend/zend_ini_scanner.h
+++ b/Zend/zend_ini_scanner.h
@@ -24,9 +24,11 @@
typedef struct _zend_file_handle zend_file_handle;
/* Scanner modes */
-#define ZEND_INI_SCANNER_NORMAL 0 /* Normal mode. [DEFAULT] */
-#define ZEND_INI_SCANNER_RAW 1 /* Raw mode. Option values are not parsed */
-#define ZEND_INI_SCANNER_TYPED 2 /* Typed mode. */
+C23_ENUM(zend_ini_scanner_mode, uint8_t) {
+ ZEND_INI_SCANNER_NORMAL = 0, /* Normal mode. [DEFAULT] */
+ ZEND_INI_SCANNER_RAW = 1, /* Raw mode. Option values are not parsed */
+ ZEND_INI_SCANNER_TYPED = 2, /* Typed mode. */
+};
BEGIN_EXTERN_C()
ZEND_COLD uint32_t zend_ini_scanner_get_lineno(void);