X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=internals%2F_PDCLIB_int.h;h=c0bbe00fe58d8c7e20e8ffa1ead947e1ae77f341;hb=42b55f2fe048f172af302c43e83733b2344854cc;hp=af4c03377028477f9213a0bd36abf535acc01ad8;hpb=ab6ee64b38cee9cd2ce9872714c77c19da9fb031;p=pdclib.old

diff --git a/internals/_PDCLIB_int.h b/internals/_PDCLIB_int.h
index af4c033..c0bbe00 100644
--- a/internals/_PDCLIB_int.h
+++ b/internals/_PDCLIB_int.h
@@ -162,7 +162,7 @@ typedef unsigned long      _PDCLIB_uint32_t;
 #endif
 
 /* Setting 'int64_t', its limits, its literal, and conversion macros.         */
-#if     _PDCLIB_LONG_BYTES == 8
+#if     _PDCLIB_LONG_BYTES == 8 && !defined(_PDCLIB_INT64_IS_LLONG)
 typedef signed long        _PDCLIB_int64_t;
 typedef unsigned long      _PDCLIB_uint64_t;
 #define _PDCLIB_INT64_MAX  _PDCLIB_LONG_MAX
@@ -230,7 +230,12 @@ typedef _PDCLIB_ptrdiff     _PDCLIB_ptrdiff_t;
 typedef _PDCLIB_size     _PDCLIB_size_t;
 #define _PDCLIB_SIZE_MAX _PDCLIB_concat( _PDCLIB_concat( _PDCLIB_, _PDCLIB_SIZE ), _MAX )
 
-typedef _PDCLIB_wchar     _PDCLIB_wchar_t;
+typedef _PDCLIB_wint      _PDCLIB_wint_t;
+#ifndef __cplusplus
+    typedef _PDCLIB_wchar     _PDCLIB_wchar_t;
+#else
+    typedef wchar_t _PDCLIB_wchar_t;
+#endif
 #define _PDCLIB_WCHAR_MIN _PDCLIB_concat( _PDCLIB_concat( _PDCLIB_, _PDCLIB_WCHAR ), _MIN )
 #define _PDCLIB_WCHAR_MAX _PDCLIB_concat( _PDCLIB_concat( _PDCLIB_, _PDCLIB_WCHAR ), _MAX )
 
@@ -277,59 +282,6 @@ typedef _PDCLIB_clock           _PDCLIB_clock_t;
         int tm_isdst;                       \
     };
 #endif
-    
-/* -------------------------------------------------------------------------- */
-/* Various <stdio.h> internals                                                */
-/* -------------------------------------------------------------------------- */
-
-/* Flags for representing mode (see fopen()). Note these must fit the same
-   status field as the _IO?BF flags in <stdio.h> and the internal flags below.
-*/
-#define _PDCLIB_FREAD     8u
-#define _PDCLIB_FWRITE   16u
-#define _PDCLIB_FAPPEND  32u 
-#define _PDCLIB_FRW      64u
-#define _PDCLIB_FBIN    128u
-
-/* Internal flags, made to fit the same status field as the flags above. */
-/* -------------------------------------------------------------------------- */
-/* free() the buffer memory on closing (false for user-supplied buffer) */
-#define _PDCLIB_FREEBUFFER   512u
-/* stream has encountered error / EOF */
-#define _PDCLIB_ERRORFLAG   1024u
-#define _PDCLIB_EOFFLAG     2048u
-/* stream is wide-oriented */
-#define _PDCLIB_WIDESTREAM  4096u
-/* stream is byte-oriented */
-#define _PDCLIB_BYTESTREAM  8192u
-/* file associated with stream should be remove()d on closing (tmpfile()) */
-#define _PDCLIB_DELONCLOSE 16384u
-/* stream handle should not be free()d on close (stdin, stdout, stderr) */
-#define _PDCLIB_STATIC     32768u
-
-/* Position / status structure for getpos() / fsetpos(). */
-struct _PDCLIB_fpos_t
-{
-    _PDCLIB_uint64_t offset; /* File position offset */
-    int              status; /* Multibyte parsing state (unused, reserved) */
-};
-
-/* FILE structure */
-struct _PDCLIB_file_t
-{
-    _PDCLIB_fd_t            handle;   /* OS file handle */
-    char *                  buffer;   /* Pointer to buffer memory */
-    _PDCLIB_size_t          bufsize;  /* Size of buffer */
-    _PDCLIB_size_t          bufidx;   /* Index of current position in buffer */
-    _PDCLIB_size_t          bufend;   /* Index of last pre-read character in buffer */
-    struct _PDCLIB_fpos_t   pos;      /* Offset and multibyte parsing state */
-    _PDCLIB_size_t          ungetidx; /* Number of ungetc()'ed characters */
-    unsigned char *         ungetbuf; /* ungetc() buffer */
-    unsigned int            status;   /* Status flags; see above */
-    /* multibyte parsing status to be added later */
-    char *                  filename; /* Name the current stream has been opened with */
-    struct _PDCLIB_file_t * next;     /* Pointer to next struct (internal) */
-};
 
 /* -------------------------------------------------------------------------- */
 /* Internal data types                                                        */
@@ -360,14 +312,14 @@ struct _PDCLIB_status_t
 {
     int              base;   /* base to which the value shall be converted   */
     _PDCLIB_int_fast32_t flags; /* flags and length modifiers                */
-    _PDCLIB_size_t   n;      /* print: maximum characters to be written      */
+    unsigned         n;      /* print: maximum characters to be written      */
                              /* scan:  number matched conversion specifiers  */
-    _PDCLIB_size_t   i;      /* number of characters read/written            */
-    _PDCLIB_size_t   current;/* chars read/written in the CURRENT conversion */
+    unsigned         i;      /* number of characters read/written            */
+    unsigned         current;/* chars read/written in the CURRENT conversion */
     char *           s;      /* *sprintf(): target buffer                    */
                              /* *sscanf():  source string                    */
-    _PDCLIB_size_t   width;  /* specified field width                        */
-    _PDCLIB_size_t   prec;   /* specified field precision                    */
+    unsigned         width;  /* specified field width                        */
+    int              prec;   /* specified field precision                    */
     struct _PDCLIB_file_t * stream; /* *fprintf() / *fscanf() stream         */
     _PDCLIB_va_list  arg;    /* argument stack                               */
 };