Merge branch 'feature/andre/anon-structs-enums' into 'master'

[Libc] remove last occurrences of anonymous composite types

See merge request frama-c/frama-c!2196

share/libc/regex.h

@@ -43,7 +43,7 @@ typedef struct re_pattern_buffer regex_t;
 #define REG_NOTEOL 2
 
 /* Error codes */
-typedef enum
+typedef enum __fc_reg_errcode_t
 {
   REG_NOERROR = 0,
   REG_NOMATCH,	  
@@ -66,7 +66,7 @@ typedef enum
 
 typedef int regoff_t;
 
-typedef struct
+typedef struct __fc_regmatch_t
 {
   regoff_t rm_so;
   regoff_t rm_eo;

share/libc/setjmp.h

@@ -41,7 +41,7 @@ extern int setjmp(jmp_buf env);
 extern void longjmp(jmp_buf env, int val);
 
 #include "__fc_define_sigset_t.h"
-typedef struct {jmp_buf buf; sigset_t sigs;} sigjmp_buf;
+typedef struct __fc_sigjmp_buf {jmp_buf buf; sigset_t sigs;} sigjmp_buf;
 
 
 extern int sigsetjmp(sigjmp_buf env, int savesigs);

share/libc/signal.h

@@ -132,7 +132,7 @@ struct sigevent {
 
 #ifndef __have_siginfo_t
 #define __have_siginfo_t
-typedef struct {
+typedef struct __fc_siginfo_t {
 	int si_signo;
 	int si_code;
 	union sigval si_value;

share/libc/wchar.h

@@ -206,7 +206,7 @@ extern int fwscanf(FILE * stream, const wchar_t * format, ...);
 extern int swscanf(const wchar_t * str, const wchar_t * format, ...);
 
 #ifndef __mbstate_t_defined
-typedef struct { int __count; char __value[4]; } mbstate_t;
+typedef struct __fc_mbstate_t { int __count; char __value[4]; } mbstate_t;
 #define __mbstate_t_defined
 #endif
 

tests/libc/oracle/fc_libc.1.res.oracle

@@ -127,7 +127,7 @@ union sigval {
    int sival_int ;
    void *sival_ptr ;
 };
-struct __anonstruct_siginfo_t_1 {
+struct __fc_siginfo_t {
    int si_signo ;
    int si_code ;
    union sigval si_value ;
@@ -138,7 +138,7 @@ struct __anonstruct_siginfo_t_1 {
    int si_status ;
    int si_band ;
 };
-typedef struct __anonstruct_siginfo_t_1 siginfo_t;
+typedef struct __fc_siginfo_t siginfo_t;
 struct sigaction {
    void (*sa_handler)(int ) ;
    void (*sa_sigaction)(int , siginfo_t *, void *) ;
@@ -338,11 +338,11 @@ struct passwd {
    char *pw_shell ;
 };
 typedef int ( jmp_buf)[5];
-struct __anonstruct_sigjmp_buf_22 {
+struct __fc_sigjmp_buf {
    jmp_buf buf ;
    sigset_t sigs ;
 };
-typedef struct __anonstruct_sigjmp_buf_22 sigjmp_buf;
+typedef struct __fc_sigjmp_buf sigjmp_buf;
 struct _code {
    char const *c_name ;
    int c_val ;