Skip to content

Commit 6c53d6a

Browse files
committed
Use __typeof__ GNUC keyword for ISO C compatibility
1 parent f1b89a2 commit 6c53d6a

File tree

2 files changed

+2
-8
lines changed

2 files changed

+2
-8
lines changed

src/cc-compat.h

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,6 @@
2929
# endif
3030
#endif
3131

32-
#ifdef __GNUC__
33-
# define GIT_TYPEOF(x) (__typeof__(x))
34-
#else
35-
# define GIT_TYPEOF(x)
36-
#endif
37-
3832
#if defined(__GNUC__)
3933
# define GIT_ALIGN(x,size) x __attribute__ ((aligned(size)))
4034
#elif defined(_MSC_VER)
@@ -46,7 +40,7 @@
4640
#if defined(__GNUC__)
4741
# define GIT_UNUSED(x) \
4842
do { \
49-
typeof(x) _unused __attribute__((unused)); \
43+
__typeof__(x) _unused __attribute__((unused)); \
5044
_unused = (x); \
5145
} while (0)
5246
#else

src/util.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
# define GIT_CONTAINER_OF(ptr, type, member) \
3535
__builtin_choose_expr( \
3636
__builtin_offsetof(type, member) == 0 && \
37-
__builtin_types_compatible_p(typeof(&((type *) 0)->member), typeof(ptr)), \
37+
__builtin_types_compatible_p(__typeof__(&((type *) 0)->member), __typeof__(ptr)), \
3838
((type *) (ptr)), \
3939
(void)0)
4040
#else

0 commit comments

Comments
 (0)