Skip to content

Commit e9b21a5

Browse files
cmb69Girgias
authored andcommitted
Remove superfluous fallback definitions of u_char
We stick with the fallback definition in php_inttypes.h, because `u_char` is actually used in ext/standard and ext/snmp, and possibly in external extensions. We also remove win32/php_inttypes.h and win32/php_stdint.h again (somehow this removal has been lost previously). Signed-off-by: George Peter Banyard <[email protected]>
1 parent f8e64fa commit e9b21a5

File tree

9 files changed

+0
-603
lines changed

9 files changed

+0
-603
lines changed

ext/fileinfo/libmagic/file.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,6 @@
6363
#include <inttypes.h>
6464
#ifdef PHP_WIN32
6565
# include <stdint.h>
66-
67-
# ifndef u_char
68-
typedef unsigned __int8 u_char;
69-
# endif
7066
#endif
7167

7268
#include "php.h"

ext/mysqlnd/config-win.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,6 @@ This file is public domain and comes with NO WARRANTY of any kind */
1515

1616
#include <stdint.h>
1717

18-
#ifndef u_char
19-
typedef unsigned __int8 u_char;
20-
#endif
21-
2218
#ifndef HAVE_INT8_T
2319
#define HAVE_INT8_T
2420
#endif

ext/sockets/conversions.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,6 @@
1818
# include <net/if.h>
1919
#else
2020
# include <stdint.h>
21-
22-
# ifndef u_char
23-
typedef unsigned __int8 u_char;
24-
# endif
2521
#endif
2622

2723
#include <limits.h>

ext/standard/image.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,6 @@
2828
#include "php_image.h"
2929
#ifdef PHP_WIN32
3030
# include <stdint.h>
31-
32-
# ifndef u_char
33-
typedef unsigned __int8 u_char;
34-
# endif
3531
#endif
3632

3733
#if HAVE_ZLIB && !defined(COMPILE_DL_ZLIB)

ext/standard/iptc.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,6 @@
3535

3636
#ifdef PHP_WIN32
3737
# include <stdint.h>
38-
39-
# ifndef u_char
40-
typedef unsigned __int8 u_char;
41-
# endif
4238
#else
4339
# include <inttypes.h>
4440
# include <stdint.h>

main/SAPI.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,6 @@
2424
#include "zend_operators.h"
2525
#ifdef PHP_WIN32
2626
# include <stdint.h>
27-
28-
# ifndef u_char
29-
typedef unsigned __int8 u_char;
30-
# endif
3127
#endif
3228
#include <sys/stat.h>
3329

main/php_stdint.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141

4242
#if defined(_MSC_VER)
4343
# include <stdint.h>
44-
4544
# ifndef u_char
4645
typedef unsigned __int8 u_char;
4746
# endif

win32/php_inttypes.h

Lines changed: 0 additions & 313 deletions
This file was deleted.

0 commit comments

Comments
 (0)