diff --git a/filesystem/filesystem.c b/filesystem/filesystem.c index e27d88a9..bdd00626 100644 --- a/filesystem/filesystem.c +++ b/filesystem/filesystem.c @@ -33,9 +33,6 @@ GNU General Public License for more details. #endif #include #include -#if XASH_LINUX -#include -#endif #include "port.h" #include "const.h" #include "crtlib.h" @@ -2106,7 +2103,7 @@ FS_UnGetc Put a character back into the read buffer (only supports one character!) ==================== */ -int FS_UnGetc( file_t *file, byte c ) +int FS_UnGetc( file_t *file, char c ) { // If there's already a character waiting to be read if( file->ungetc != EOF ) @@ -2123,7 +2120,7 @@ FS_Gets Same as fgets ==================== */ -int FS_Gets( file_t *file, byte *string, size_t bufsize ) +int FS_Gets( file_t *file, char *string, size_t bufsize ) { int c, end = 0; @@ -2145,7 +2142,7 @@ int FS_Gets( file_t *file, byte *string, size_t bufsize ) c = FS_Getc( file ); if( c != '\n' ) - FS_UnGetc( file, (byte)c ); + FS_UnGetc( file, c ); } return c; diff --git a/filesystem/filesystem.h b/filesystem/filesystem.h index d53dfc24..e38ebe03 100644 --- a/filesystem/filesystem.h +++ b/filesystem/filesystem.h @@ -155,8 +155,8 @@ typedef struct fs_api_t qboolean (*Eof)( file_t *file ); int (*Flush)( file_t *file ); int (*Close)( file_t *file ); - int (*Gets)( file_t *file, byte *string, size_t bufsize ); - int (*UnGetc)( file_t *file, byte c ); + int (*Gets)( file_t *file, char *string, size_t bufsize ); + int (*UnGetc)( file_t *file, char c ); int (*Getc)( file_t *file ); int (*VPrintf)( file_t *file, const char *format, va_list ap ); int (*Printf)( file_t *file, const char *format, ... ) _format( 2 ); diff --git a/filesystem/filesystem_internal.h b/filesystem/filesystem_internal.h index 83d2fa78..51748b22 100644 --- a/filesystem/filesystem_internal.h +++ b/filesystem/filesystem_internal.h @@ -144,8 +144,8 @@ fs_offset_t FS_Tell( file_t *file ); qboolean FS_Eof( file_t *file ); int FS_Flush( file_t *file ); int FS_Close( file_t *file ); -int FS_Gets( file_t *file, byte *string, size_t bufsize ); -int FS_UnGetc( file_t *file, byte c ); +int FS_Gets( file_t *file, char *string, size_t bufsize ); +int FS_UnGetc( file_t *file, char c ); int FS_Getc( file_t *file ); int FS_VPrintf( file_t *file, const char *format, va_list ap ); int FS_Printf( file_t *file, const char *format, ... ) _format( 2 );