Skip to content

Avoid C99 typedef redeclaration error #15079

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 12 commits into from
Closed

Avoid C99 typedef redeclaration error #15079

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
fd04377
Avoid C99 typedef redeclaration error
iluuu1994 Jul 23, 2024
8c52e7d
Fix C99 typedef redeclaration errors in Zend/
iluuu1994 Jul 24, 2024
bb878f9
Fix C11 asm keyword
iluuu1994 Jul 24, 2024
ca2061b
Fix C99 typedef redeclaration errors in ext-random
iluuu1994 Jul 24, 2024
939b283
Fix C99 typedef redeclaration errors in opcache
iluuu1994 Jul 24, 2024
3516395
Fix C99 typedef redeclaration errors in ext-dom
iluuu1994 Jul 24, 2024
5d22529
Compile with -std=c99 in CI with Clang
iluuu1994 Jul 24, 2024
aca2fe3
Fix missing typedef in xsl
iluuu1994 Jul 24, 2024
c332466
Fix more asm keywords
iluuu1994 Jul 24, 2024
e44882e
Fix ext-bcmath c99 typedef redeclaration errors
iluuu1994 Jul 24, 2024
13887bd
Fix one more header
iluuu1994 Jul 24, 2024
e94ce69
Fix gdb source file
iluuu1994 Jul 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions Zend/zend_property_hooks.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,19 +23,21 @@

BEGIN_EXTERN_C()

typedef struct _zend_array zend_array;
typedef struct _zend_class_entry zend_class_entry;
typedef struct _zend_object zend_object;
typedef struct _zend_object_iterator zend_object_iterator;
typedef struct _zval_struct zval;
/* Intentionally avoid typedef because of C99 redeclaration errors. */
struct _zend_array;
Copy link
Member

@TimWolla TimWolla Jul 23, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seeing this, I already wondered before: Why is the struct tag even prefixed with an underscore instead of matching the typedef'd name exactly?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this is just an convention to avoid having identical names. And maybe also as a hint that clients should use the typedef'd name.

struct _zend_class_entry;
struct _zend_object;
struct _zend_object_iterator;
struct _zval_struct;

typedef enum {
ZEND_PROPERTY_HOOK_GET = 0,
ZEND_PROPERTY_HOOK_SET = 1,
} zend_property_hook_kind;

ZEND_API zend_object_iterator *zend_hooked_object_get_iterator(zend_class_entry *ce, zval *object, int by_ref);
ZEND_API zend_array *zend_hooked_object_build_properties(zend_object *zobj);
ZEND_API struct _zend_object_iterator *zend_hooked_object_get_iterator(
struct _zend_class_entry *ce, struct _zval_struct *object, int by_ref);
ZEND_API struct _zend_array *zend_hooked_object_build_properties(struct _zend_object *zobj);

END_EXTERN_C()

Expand Down