X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=internals%2F_PDCLIB_int.h;h=5d503ccc120ea7152a8895b3ca5f17eac94ea706;hb=66c9a724d570ec507c640f6708fe48c4b8ca8b80;hp=0ce2c99fc383ab9c700ceb42482203a3cc0da7fe;hpb=d9e48b611b63bcfc55727463cb9d9d0e87a7a405;p=pdclib diff --git a/internals/_PDCLIB_int.h b/internals/_PDCLIB_int.h index 0ce2c99..5d503cc 100644 --- a/internals/_PDCLIB_int.h +++ b/internals/_PDCLIB_int.h @@ -118,8 +118,6 @@ typedef unsigned char _PDCLIB_uint8_t; #define _PDCLIB_INT8_MAX _PDCLIB_CHAR_MAX #define _PDCLIB_INT8_MIN _PDCLIB_CHAR_MIN #define _PDCLIB_UINT8_MAX _PDCLIB_UCHAR_MAX -#define _PDCLIB_INT8_LITERAL -#define _PDCLIB_UINT8_LITERAL #else #error Unsupported width of char (not 8 bits). #endif @@ -131,16 +129,12 @@ typedef unsigned int _PDCLIB_uint16_t; #define _PDCLIB_INT16_MAX _PDCLIB_INT_MAX #define _PDCLIB_INT16_MIN _PDCLIB_INT_MIN #define _PDCLIB_UINT16_MAX _PDCLIB_UINT_MAX -#define _PDCLIB_INT16_LITERAL -#define _PDCLIB_UINT16_LITERAL #elif _PDCLIB_SHRT_BYTES == 2 typedef signed short _PDCLIB_int16_t; typedef unsigned short _PDCLIB_uint16_t; #define _PDCLIB_INT16_MAX _PDCLIB_SHRT_MAX #define _PDCLIB_INT16_MIN _PDCLIB_SHRT_MIN #define _PDCLIB_UINT16_MAX _PDCLIB_USHRT_MAX -#define _PDCLIB_INT16_LITERAL s -#define _PDCLIB_UINT16_LITERAL us #else #error Neither 'short' nor 'int' are 16-bit. #endif @@ -276,9 +270,9 @@ struct _PDCLIB_file_t _PDCLIB_fpos_t position; /* file position indicator */ char * buffer; /* file buffer */ _PDCLIB_size_t bufsize; /* size of buffer */ - _PDCLIB_size_t bufidx; /* pointer into buffer */ + _PDCLIB_size_t bufidx; /* index to point of action in buffer */ + _PDCLIB_size_t bufend; /* index to end of pre-read buffer */ unsigned int status; /* misc. status bits */ - /*mbstate_t mbstate; multibyte parse state - TODO: Unmask. */ struct _PDCLIB_file_t * next; /* provisions for linked list handling */ };