Merge branch 'main' into beta

symplely · Feb 12, 2023 · b85d2fd · b85d2fd
2 parents 95a3209 + d5212b1
commit b85d2fd
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 112 deletions.
diff --git a/headers/ze7.h b/headers/ze7.h
@@ -1,23 +1,10 @@
 #define FFI_SCOPE "__zend__"
 
-typedef struct _IO_FILE __FILE;
+typedef struct _IO_FILE FILE;
 typedef long int __off_t;
 typedef long int __off64_t;
 typedef uintptr_t zend_type;
 
-typedef struct
-{
-	int level;			   /* fill/empty level of buffer */
-	unsigned flags;		   /* File status flags */
-	char fd;			   /* File descriptor */
-	unsigned char hold;	   /* Ungetc char if no buffer */
-	int bsize;			   /* Buffer size */
-	unsigned char *buffer; /* Data transfer buffer */
-	unsigned char *curp;   /* Current active pointer */
-	unsigned istemp;	   /* Temporary file indicator */
-	short token;		   /* Used for validity checking */
-} FILE;
-
 typedef enum
 {
 	SUCCESS = 0,

diff --git a/headers/ze7ts.h b/headers/ze7ts.h
@@ -1,23 +1,10 @@
 #define FFI_SCOPE "__zend__"
 
-typedef struct _IO_FILE __FILE;
+typedef struct _IO_FILE FILE;
 typedef long int __off_t;
 typedef long int __off64_t;
 typedef uintptr_t zend_type;
 
-typedef struct
-{
-	int level;			   /* fill/empty level of buffer */
-	unsigned flags;		   /* File status flags */
-	char fd;			   /* File descriptor */
-	unsigned char hold;	   /* Ungetc char if no buffer */
-	int bsize;			   /* Buffer size */
-	unsigned char *buffer; /* Data transfer buffer */
-	unsigned char *curp;   /* Current active pointer */
-	unsigned istemp;	   /* Temporary file indicator */
-	short token;		   /* Used for validity checking */
-} FILE;
-
 typedef enum
 {
 	SUCCESS = 0,

diff --git a/headers/ze8.h b/headers/ze8.h
@@ -1,22 +1,9 @@
 #define FFI_SCOPE "__zend__"
 
-typedef struct _IO_FILE __FILE;
+typedef struct _IO_FILE FILE;
 typedef long int __off_t;
 typedef long int __off64_t;
 
-typedef struct
-{
-	int level;			   /* fill/empty level of buffer */
-	unsigned flags;		   /* File status flags */
-	char fd;			   /* File descriptor */
-	unsigned char hold;	   /* Ungetc char if no buffer */
-	int bsize;			   /* Buffer size */
-	unsigned char *buffer; /* Data transfer buffer */
-	unsigned char *curp;   /* Current active pointer */
-	unsigned istemp;	   /* Temporary file indicator */
-	short token;		   /* Used for validity checking */
-} FILE;
-
 typedef enum
 {
 	SUCCESS = 0,

diff --git a/headers/ze81.h b/headers/ze81.h
@@ -1,22 +1,9 @@
 #define FFI_SCOPE "__zend__"
 
-typedef struct _IO_FILE __FILE;
+typedef struct _IO_FILE FILE;
 typedef long int __off_t;
 typedef long int __off64_t;
 
-typedef struct
-{
-	int level;			   /* fill/empty level of buffer */
-	unsigned flags;		   /* File status flags */
-	char fd;			   /* File descriptor */
-	unsigned char hold;	   /* Ungetc char if no buffer */
-	int bsize;			   /* Buffer size */
-	unsigned char *buffer; /* Data transfer buffer */
-	unsigned char *curp;   /* Current active pointer */
-	unsigned istemp;	   /* Temporary file indicator */
-	short token;		   /* Used for validity checking */
-} FILE;
-
 typedef enum
 {
 	SUCCESS = 0,

diff --git a/headers/ze81ts.h b/headers/ze81ts.h
@@ -1,22 +1,9 @@
 #define FFI_SCOPE "__zend__"
 
-typedef struct _IO_FILE __FILE;
+typedef struct _IO_FILE FILE;
 typedef long int __off_t;
 typedef long int __off64_t;
 
-typedef struct
-{
-	int level;			   /* fill/empty level of buffer */
-	unsigned flags;		   /* File status flags */
-	char fd;			   /* File descriptor */
-	unsigned char hold;	   /* Ungetc char if no buffer */
-	int bsize;			   /* Buffer size */
-	unsigned char *buffer; /* Data transfer buffer */
-	unsigned char *curp;   /* Current active pointer */
-	unsigned istemp;	   /* Temporary file indicator */
-	short token;		   /* Used for validity checking */
-} FILE;
-
 typedef enum
 {
 	SUCCESS = 0,

diff --git a/headers/ze82.h b/headers/ze82.h
@@ -1,22 +1,9 @@
 #define FFI_SCOPE "__zend__"
 
-typedef struct _IO_FILE __FILE;
+typedef struct _IO_FILE FILE;
 typedef long int __off_t;
 typedef long int __off64_t;
 
-typedef struct
-{
-	int level;			   /* fill/empty level of buffer */
-	unsigned flags;		   /* File status flags */
-	char fd;			   /* File descriptor */
-	unsigned char hold;	   /* Ungetc char if no buffer */
-	int bsize;			   /* Buffer size */
-	unsigned char *buffer; /* Data transfer buffer */
-	unsigned char *curp;   /* Current active pointer */
-	unsigned istemp;	   /* Temporary file indicator */
-	short token;		   /* Used for validity checking */
-} FILE;
-
 typedef enum
 {
 	SUCCESS = 0,

diff --git a/headers/ze82ts.h b/headers/ze82ts.h
@@ -1,22 +1,9 @@
 #define FFI_SCOPE "__zend__"
 
-typedef struct _IO_FILE __FILE;
+typedef struct _IO_FILE FILE;
 typedef long int __off_t;
 typedef long int __off64_t;
 
-typedef struct
-{
-	int level;			   /* fill/empty level of buffer */
-	unsigned flags;		   /* File status flags */
-	char fd;			   /* File descriptor */
-	unsigned char hold;	   /* Ungetc char if no buffer */
-	int bsize;			   /* Buffer size */
-	unsigned char *buffer; /* Data transfer buffer */
-	unsigned char *curp;   /* Current active pointer */
-	unsigned istemp;	   /* Temporary file indicator */
-	short token;		   /* Used for validity checking */
-} FILE;
-
 typedef enum
 {
 	SUCCESS = 0,

diff --git a/headers/ze8ts.h b/headers/ze8ts.h
@@ -1,22 +1,9 @@
 #define FFI_SCOPE "__zend__"
 
-typedef struct _IO_FILE __FILE;
+typedef struct _IO_FILE FILE;
 typedef long int __off_t;
 typedef long int __off64_t;
 
-typedef struct
-{
-	int level;			   /* fill/empty level of buffer */
-	unsigned flags;		   /* File status flags */
-	char fd;			   /* File descriptor */
-	unsigned char hold;	   /* Ungetc char if no buffer */
-	int bsize;			   /* Buffer size */
-	unsigned char *buffer; /* Data transfer buffer */
-	unsigned char *curp;   /* Current active pointer */
-	unsigned istemp;	   /* Temporary file indicator */
-	short token;		   /* Used for validity checking */
-} FILE;
-
 typedef enum
 {
 	SUCCESS = 0,