nortti
/
sortix-mirror
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rename struct FILE to struct __FILE.

This commit is contained in:
Jonas 'Sortie' Termansen 2015-05-10 23:41:10 +02:00
parent 7098286b34
commit 3750de1f11
5 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libc/include/FILE.h
View File

@ -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. This file is part of the Sortix C Library.
@ -51,7 +51,7 @@ typedef __ssize_t ssize_t;
#ifndef __FILE_defined #ifndef __FILE_defined
#define __FILE_defined #define __FILE_defined
typedef struct FILE FILE; typedef struct __FILE FILE;
#endif #endif
#define _FILE_REGISTERED (1<<0) #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 /* Note stdio/stdio.cpp's declarations of stdin/stdout/stderr also needs to be
changed if you make changes to this structure. */ 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 /* 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 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); off_t (*seek_func)(void* user, off_t offset, int whence);
int (*fileno_func)(void* user); int (*fileno_func)(void* user);
int (*close_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. */ /* Application writers shouldn't use anything beyond this point. */
pthread_mutex_t file_lock; pthread_mutex_t file_lock;
int (*fflush_indirect)(FILE*); int (*fflush_indirect)(FILE*);
void (*buffer_free_indirect)(void*); void (*buffer_free_indirect)(void*);
struct FILE* prev; FILE* prev;
struct FILE* next; FILE* next;
int flags; int flags;
int buffer_mode; int buffer_mode;
size_t offset_input_buffer; size_t offset_input_buffer;

4
libc/include/grp.h
View File

@ -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. This file is part of the Sortix C Library.
@ -33,7 +33,7 @@ __BEGIN_DECLS
#ifndef __FILE_defined #ifndef __FILE_defined
#define __FILE_defined #define __FILE_defined
typedef struct FILE FILE; typedef struct __FILE FILE;
#endif #endif
#ifndef __gid_t_defined #ifndef __gid_t_defined

4
libc/include/pwd.h
View File

@ -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. This file is part of the Sortix C Library.
@ -33,7 +33,7 @@ __BEGIN_DECLS
#ifndef __FILE_defined #ifndef __FILE_defined
#define __FILE_defined #define __FILE_defined
typedef struct FILE FILE; typedef struct __FILE FILE;
#endif #endif
#ifndef __gid_t_defined #ifndef __gid_t_defined

2
libc/include/stdio.h
View File

@ -73,7 +73,7 @@ typedef __ssize_t ssize_t;
#ifndef __FILE_defined #ifndef __FILE_defined
#define __FILE_defined #define __FILE_defined
typedef struct FILE FILE; typedef struct __FILE FILE;
#endif #endif
#if __USE_SORTIX || 2008 <= __USE_POSIX #if __USE_SORTIX || 2008 <= __USE_POSIX

4
libc/include/wchar.h
View File

@ -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. This file is part of the Sortix C Library.
@ -71,7 +71,7 @@ typedef __off_t off_t;
#if !(__USE_SORTIX || __USE_POSIX) #if !(__USE_SORTIX || __USE_POSIX)
/* Intentional namespace pollution due to ISO C stupidity: */ /* Intentional namespace pollution due to ISO C stupidity: */
#endif #endif
typedef struct FILE FILE; typedef struct __FILE FILE;
#endif #endif
#if __USE_SORTIX || 200809L <= __USE_POSIX #if __USE_SORTIX || 200809L <= __USE_POSIX