From 3750de1f11f507d0c264cc4c3fc97332af2a14d5 Mon Sep 17 00:00:00 2001 From: Jonas 'Sortie' Termansen Date: Sun, 10 May 2015 23:41:10 +0200 Subject: [PATCH] Rename struct FILE to struct __FILE. --- libc/include/FILE.h | 12 ++++++------ libc/include/grp.h | 4 ++-- libc/include/pwd.h | 4 ++-- libc/include/stdio.h | 2 +- libc/include/wchar.h | 4 ++-- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/libc/include/FILE.h b/libc/include/FILE.h index 17f6a41b..83c377f5 100644 --- a/libc/include/FILE.h +++ b/libc/include/FILE.h @@ -1,6 +1,6 @@ /******************************************************************************* - Copyright(C) Jonas 'Sortie' Termansen 2011, 2012, 2013, 2014. + Copyright(C) Jonas 'Sortie' Termansen 2011, 2012, 2013, 2014, 2015. This file is part of the Sortix C Library. @@ -51,7 +51,7 @@ typedef __ssize_t ssize_t; #ifndef __FILE_defined #define __FILE_defined -typedef struct FILE FILE; +typedef struct __FILE FILE; #endif #define _FILE_REGISTERED (1<<0) @@ -68,7 +68,7 @@ typedef struct FILE FILE; /* Note stdio/stdio.cpp's declarations of stdin/stdout/stderr also needs to be changed if you make changes to this structure. */ -struct FILE +struct __FILE { /* This is non-standard, but useful. If you allocate your own FILE and register it with fregister, feel free to use modify the following members @@ -84,13 +84,13 @@ struct FILE off_t (*seek_func)(void* user, off_t offset, int whence); int (*fileno_func)(void* user); int (*close_func)(void* user); - void (*free_func)(void* free_user, struct FILE* fp); + void (*free_func)(void* free_user, FILE* fp); /* Application writers shouldn't use anything beyond this point. */ pthread_mutex_t file_lock; int (*fflush_indirect)(FILE*); void (*buffer_free_indirect)(void*); - struct FILE* prev; - struct FILE* next; + FILE* prev; + FILE* next; int flags; int buffer_mode; size_t offset_input_buffer; diff --git a/libc/include/grp.h b/libc/include/grp.h index 970d9721..b79ef419 100644 --- a/libc/include/grp.h +++ b/libc/include/grp.h @@ -1,6 +1,6 @@ /******************************************************************************* - Copyright(C) Jonas 'Sortie' Termansen 2013. + Copyright(C) Jonas 'Sortie' Termansen 2013, 2015. This file is part of the Sortix C Library. @@ -33,7 +33,7 @@ __BEGIN_DECLS #ifndef __FILE_defined #define __FILE_defined -typedef struct FILE FILE; +typedef struct __FILE FILE; #endif #ifndef __gid_t_defined diff --git a/libc/include/pwd.h b/libc/include/pwd.h index de26a466..7ceeeec9 100644 --- a/libc/include/pwd.h +++ b/libc/include/pwd.h @@ -1,6 +1,6 @@ /******************************************************************************* - Copyright(C) Jonas 'Sortie' Termansen 2013. + Copyright(C) Jonas 'Sortie' Termansen 2013, 2015. This file is part of the Sortix C Library. @@ -33,7 +33,7 @@ __BEGIN_DECLS #ifndef __FILE_defined #define __FILE_defined -typedef struct FILE FILE; +typedef struct __FILE FILE; #endif #ifndef __gid_t_defined diff --git a/libc/include/stdio.h b/libc/include/stdio.h index 9f0a7ce1..4a147473 100644 --- a/libc/include/stdio.h +++ b/libc/include/stdio.h @@ -73,7 +73,7 @@ typedef __ssize_t ssize_t; #ifndef __FILE_defined #define __FILE_defined -typedef struct FILE FILE; +typedef struct __FILE FILE; #endif #if __USE_SORTIX || 2008 <= __USE_POSIX diff --git a/libc/include/wchar.h b/libc/include/wchar.h index 90083010..d8da2966 100644 --- a/libc/include/wchar.h +++ b/libc/include/wchar.h @@ -1,6 +1,6 @@ /******************************************************************************* - Copyright(C) Jonas 'Sortie' Termansen 2011, 2012, 2013, 2014. + Copyright(C) Jonas 'Sortie' Termansen 2011, 2012, 2013, 2014, 2015. This file is part of the Sortix C Library. @@ -71,7 +71,7 @@ typedef __off_t off_t; #if !(__USE_SORTIX || __USE_POSIX) /* Intentional namespace pollution due to ISO C stupidity: */ #endif -typedef struct FILE FILE; +typedef struct __FILE FILE; #endif #if __USE_SORTIX || 200809L <= __USE_POSIX