types: add #defines to typedefs

Hubert Badocha · Hubert Badocha · commit 8aad691e7654 · 2025-03-18T14:36:15.000+01:00
Some external program eg mbedtls check for those defines to checks if a
type is available.

JIRA: RTOS-1027
diff --git a/include/glob.h b/include/glob.h
@@ -67,6 +67,8 @@ typedef struct {
 	int (*gl_stat)(const char *, struct stat *);
 } glob_t;
 
+#define glob_t glob_t
+
 #define	GLOB_APPEND	0x0001	/* Append to output from previous call. */
 #define	GLOB_DOOFFS	0x0002	/* Use gl_offs. */
 #define	GLOB_ERR	0x0004	/* Return on error. */
diff --git a/include/regex.h b/include/regex.h
@@ -49,18 +49,24 @@ extern "C" {
 /* types */
 typedef off_t regoff_t;
 
+#define regoff_t regoff_t
+
 typedef struct {
 	int re_magic;
 	size_t re_nsub;		/* number of parenthesized subexpressions */
 	__const char *re_endp;	/* end pointer for REG_PEND */
 	struct re_guts *re_g;	/* none of your business :-) */
 } regex_t;
 
+#define regex_t regex_t
+
 typedef struct {
 	regoff_t rm_so;		/* start of match */
 	regoff_t rm_eo;		/* end of match */
 } regmatch_t;
 
+#define regmatch_t regmatch_t
+
 /* regcomp() flags */
 #define	REG_BASIC	0000
 #define	REG_EXTENDED	0001
diff --git a/include/setjmp.h b/include/setjmp.h
@@ -27,6 +27,9 @@ extern "C" {
 typedef struct __jmp_buf jmp_buf[1];
 typedef jmp_buf sigjmp_buf;
 
+#define jmp_buf    jmp_buf
+#define sigjmp_buf sigjmp_buf
+
 
 extern int _setjmp(jmp_buf var);
 
diff --git a/include/signal.h b/include/signal.h
@@ -28,6 +28,8 @@ extern "C" {
 
 typedef void (*sighandler_t)(int);
 
+#define sighandler_t sighandler_t
+
 #define SIGHUP     1
 #define SIGINT     2
 #define SIGQUIT    3
@@ -84,6 +86,9 @@ enum { SIG_BLOCK, SIG_SETMASK, SIG_UNBLOCK };
 typedef int sigset_t;
 typedef int sig_atomic_t;
 
+#define sigset_t     sigset_t
+#define sig_atomic_t sig_atomic_t
+
 
 union sigval {
 	int sival_int;
diff --git a/include/stdint.h b/include/stdint.h
@@ -42,6 +42,16 @@ typedef __u16 uint16_t;
 typedef __u32 uint32_t;
 typedef __u64 uint64_t;
 
+#define int8_t  int8_t
+#define int16_t int16_t
+#define int32_t int32_t
+#define int64_t int64_t
+
+#define uint8_t  uint8_t
+#define uint16_t uint16_t
+#define uint32_t uint32_t
+#define uint64_t uint64_t
+
 /* 7.18.1.2 Minimum-width integer types */
 
 typedef int8_t int_least8_t;
@@ -54,6 +64,16 @@ typedef uint16_t uint_least16_t;
 typedef uint32_t uint_least32_t;
 typedef uint64_t uint_least64_t;
 
+#define int_least8_t  int_least8_t
+#define int_least16_t int_least16_t
+#define int_least32_t int_least32_t
+#define int_least64_t int_least64_t
+
+#define uint_least8_t  uint_least8_t
+#define uint_least16_t uint_least16_t
+#define uint_least32_t uint_least32_t
+#define uint_least64_t uint_least64_t
+
 /* 7.18.2.1 Limits of exact-width integer types */
 
 #define INT8_MIN  (-127 - 1)
diff --git a/include/stdio.h b/include/stdio.h
@@ -51,6 +51,8 @@ extern "C" {
 
 typedef off_t fpos_t;
 
+#define fpos_t fpos_t
+
 
 typedef struct _FILE {
 	int fd;
@@ -67,13 +69,17 @@ typedef struct _FILE {
 	struct _FILE *prev;
 } FILE;
 
+#define FILE FILE
+
 
 typedef struct _DIR {
 	oid_t oid;
 	size_t pos;
 	struct dirent *dirent;
 } DIR;
 
+#define DIR DIR
+
 
 typedef struct _IO_cookie_io_functions
 {
@@ -83,6 +89,8 @@ typedef struct _IO_cookie_io_functions
 	void *close;
 } cookie_io_functions_t;
 
+#define cookie_io_functions_t cookie_io_functions_t
+
 
 extern FILE *stderr, *stdin, *stdout;
 
diff --git a/include/stdlib.h b/include/stdlib.h
@@ -54,6 +54,11 @@ typedef struct
 } lldiv_t;
 
 
+#define div_t   div_t
+#define ldiv_t  ldiv_t
+#define lldiv_t lldiv_t
+
+
 /* Converts the string pointed to by the argument str to a floating-point number (type double). */
 extern double atof(const char *str);
 
diff --git a/include/sys/socktypes.h b/include/sys/socktypes.h
@@ -20,4 +20,6 @@
 
 typedef size_t socklen_t;
 
+#define socklen_t socklen_t
+
 #endif
diff --git a/include/syslog.h b/include/syslog.h
@@ -56,6 +56,8 @@ typedef struct _code {
 	int	c_val;
 } CODE;
 
+#define CODE CODE
+
 CODE prioritynames[] = {
 	"alert",	LOG_ALERT,
 	"crit",		LOG_CRIT,
diff --git a/include/termios.h b/include/termios.h
@@ -30,6 +30,10 @@ typedef unsigned cc_t;
 typedef int speed_t;
 typedef int tcflag_t;
 
+#define cc_t     cc_t
+#define speed_t  speed_t
+#define tcflag_t tcflag_t
+
 
 /* c_cc characters */
 /* these need to be define's as various programs test them in preprocessor macros */
diff --git a/include/wchar.h b/include/wchar.h
@@ -41,6 +41,10 @@ typedef struct
 } mbstate_t;
 
 
+#define wint_t wint_t
+#define mbstate_t mbstate_t
+
+
 extern int wcscmp(const wchar_t *ws1, const wchar_t *ws2);
 
 
diff --git a/math/common.h b/math/common.h
@@ -37,6 +37,9 @@ typedef union {
 } conv_t;
 
 
+#define conv_t conv_t
+
+
 extern void normalizeSub(double *x, int *exp);
 
 
diff --git a/regex/cclass.h b/regex/cclass.h
@@ -42,6 +42,8 @@
 typedef enum {CALNUM, CALPHA, CBLANK, CCNTRL, CDIGIT, CGRAPH,
 	      CLOWER, CPRINT, CPUNCT, CSPACE, CUPPER, CXDIGIT} citype;
 
+#define citype citype
+
 /* character-class table */
 static struct cclass {
 	char *name;
diff --git a/regex/regex2.h b/regex/regex2.h
@@ -78,6 +78,8 @@
  */
 typedef unsigned long sop;	/* strip operator */
 typedef long sopno;
+#define sop sop
+#define sopno sopno
 #define	OPRMASK	0xf8000000L
 #define	OPDMASK	0x07ffffffL
 #define	OPSHIFT	((unsigned)27)
@@ -126,6 +128,7 @@ typedef struct {
 	size_t smultis;
 	char *multis;		/* -> char[smulti]  ab\0cd\0ef\0\0 */
 } cset;
+#define cset cset
 /* note that CHadd and CHsub are unsafe, and CHIN doesn't yield 0/1 */
 #define CHadd(cs, c)    ((cs)->ptr[(uch)(c)] |= (cs)->mask, (cs)->hash += (uch)(c))
 #define CHsub(cs, c)    ((cs)->ptr[(uch)(c)] &= ~(cs)->mask, (cs)->hash -= (uch)(c))
@@ -136,6 +139,7 @@ typedef struct {
 
 /* stuff for character categories */
 typedef unsigned char cat_t;
+#define cat_t cat_t
 
 /*
  * main compiled-expression structure
diff --git a/regex/utils.h b/regex/utils.h
@@ -43,6 +43,7 @@
 #define	INFINITY	(DUPMAX + 1)
 #define	NC		(CHAR_MAX - CHAR_MIN + 1)
 typedef unsigned char uch;
+#define uch uch
 
 /* switch off assertions (if not already off) if no REDEBUG */
 #ifndef REDEBUG
diff --git a/regex/wordexp2.h b/regex/wordexp2.h
@@ -14,6 +14,7 @@ typedef struct {
   SLIST_HEAD(ewords_head, ewords_entry) list;
   char *we_wordv[1];
 } ext_wordv_t;
+#define ext_wordv_t ext_wordv_t
 
 #define WE_WORDV_TO_EXT_WORDV(wordv) \
   (ext_wordv_t *)((void *)(wordv) - offsetof(ext_wordv_t, we_wordv))
diff --git a/stdio/bignum.h b/stdio/bignum.h
@@ -27,12 +27,17 @@
 typedef uint32_t bignum_data_t;
 typedef uint64_t bignum_ddata_t;
 
+#define bignum_data_t bignum_data_t
+#define bignum_ddata_t bignum_ddata_t
+
 typedef struct bignum {
 	size_t len, size;
 	bignum_data_t *data;
 	bignum_data_t stackBuffer[BIGNUM_STACK_BUFFER_SIZE];
 } bignum_t;
 
+#define bignum_t bignum_t
+
 extern int bignum_init(bignum_t *bn, size_t size, bignum_data_t val);
 
 
diff --git a/stdio/format.h b/stdio/format.h
@@ -25,6 +25,8 @@
 
 typedef void (*feedfunc)(void *, char);
 
+#define feedfunc feedfunc
+
 
 extern int format_parse(void *ctx, feedfunc feed, const char *format, va_list args);
 
