X-Git-Url: https://pd.if.org/git/?p=pdclib;a=blobdiff_plain;f=platform%2Fwin32%2Finternals%2F_PDCLIB_config.h;h=63cbdf9d86652bad0e67b22048a9dd3eb18163b6;hp=c6da3ef5a02afea68a3c4ab3aa36722bd7ea1398;hb=ea66319bf240c51e4f33caf868e1774e32ef19d6;hpb=68530b0da9e164ca1f36374be11b03f2f6cd0c9f diff --git a/platform/win32/internals/_PDCLIB_config.h b/platform/win32/internals/_PDCLIB_config.h index c6da3ef..63cbdf9 100644 --- a/platform/win32/internals/_PDCLIB_config.h +++ b/platform/win32/internals/_PDCLIB_config.h @@ -27,14 +27,6 @@ /* specific platforms, e.g. by swapping int instead of char. */ #define _PDCLIB_memswp( i, j, size ) char tmp; do { tmp = *i; *i++ = *j; *j++ = tmp; } while ( --size ); -/* The maximum value that errno can be set to. This is used to set the size */ -/* of the array in struct lconv () holding error messages for the */ -/* strerror() and perror() functions. (If you change this value because you */ -/* are using additional errno values, you *HAVE* to provide appropriate error */ -/* messages for *ALL* locales.) */ -/* Default is 4 (0, ERANGE, EDOM, EILSEQ). */ -#define _PDCLIB_ERRNO_MAX 4 - /* -------------------------------------------------------------------------- */ /* Integers */ /* -------------------------------------------------------------------------- */ @@ -47,7 +39,7 @@ /* first, before going to lengths about it. */ /* -------------------------------------------------------------------------- */ -/* Comment out (or delete) the line below if your 'char' type is unsigned. */ +/* Set to 0 if your 'char' type is unsigned. */ #define _PDCLIB_CHAR_SIGNED 1 /* Width of the integer types short, int, long, and long long, in bytes. */ @@ -124,15 +116,29 @@ struct _PDCLIB_lldiv_t /* defines here are merely "configuration". See above for details. */ /* -------------------------------------------------------------------------- */ -/* The result type of substracting two pointers */ +/* The types used for size_t and ptrdiff_t should not have an integer conversion + rank greater than that of signed long int unless the implementation supports + objects large enough to make this necessary. +*/ + +/* Result type of substracting two pointers (must be signed) */ +#if defined(__amd64__) || defined(_M_AMD64) +#define _PDCLIB_ptrdiff long long +#define _PDCLIB_PTRDIFF LLONG +#define _PDCLIB_PTR_CONV ll +#else +#define _PDCLIB_ptrdiff int +#define _PDCLIB_PTRDIFF INT +#define _PDCLIB_PTR_CONV +#endif + +/* Result type of the 'sizeof' operator (must be unsigned) */ #if defined(__amd64__) || defined(_M_AMD64) - #define _PDCLIB_ptrdiff long long - #define _PDCLIB_PTRDIFF LLONG - #define _PDCLIB_PTR_CONV ll +#define _PDCLIB_size unsigned long long +#define _PDCLIB_SIZE ULLONG #else - #define _PDCLIB_ptrdiff int - #define _PDCLIB_PTRDIFF INT - #define _PDCLIB_PTR_CONV +#define _PDCLIB_size unsigned int +#define _PDCLIB_SIZE UINT #endif /* An integer type that can be accessed as atomic entity (think asynchronous @@ -142,30 +148,39 @@ struct _PDCLIB_lldiv_t #define _PDCLIB_sig_atomic int #define _PDCLIB_SIG_ATOMIC INT -/* Result type of the 'sizeof' operator (must be unsigned) */ -#if defined(__amd64__) || defined(_M_AMD64) - #define _PDCLIB_size unsigned long long - #define _PDCLIB_SIZE ULLONG -#else - #define _PDCLIB_size unsigned int - #define _PDCLIB_SIZE UINT -#endif - -/* Large enough an integer to hold all character codes of the largest supported - locale. +/* Object type whose alignment is as great as supported by implementation + in all contexts. +*/ +#define _PDCLIB_max_align long double - XX: Windows requires wchar_t be an unsigned short, but this is not compliant. +/* Integer type whose range of values can represent distinct codes for + all members of the largest extended character set specified among the + supported locales. + Note that the definition of this type must agree with the type used + by the compiler for L"" string and L'' character literals. */ -#define _PDCLIB_wint signed short -#define _PDCLIB_wchar unsigned short +#define _PDCLIB_wchar unsigned short #define _PDCLIB_WCHAR USHRT +/* Each member of the basic character set shall have a code value equal + to its value when used as the lone character in an integer character + constant. If that is not the case, uncomment the following line. +#define __STDC_MB_MIGHT_NEQ_WC__ +*/ + +/* Integer type unchanged by default argument promotions that can hold any + value corresponding to characters of the extended character set, as well + as at least one value that does not correspond to any member of the + extended character set (WEOF). +*/ +#define _PDCLIB_wint signed int + #if defined(__amd64__) || defined(_M_AMD64) - #define _PDCLIB_intptr long long - #define _PDCLIB_INTPTR LLONG +#define _PDCLIB_intptr long long +#define _PDCLIB_INTPTR LLONG #else - #define _PDCLIB_intptr int - #define _PDCLIB_INTPTR INT +#define _PDCLIB_intptr int +#define _PDCLIB_INTPTR INT #endif /* Largest supported integer type. Implementation note: see _PDCLIB_atomax(). */ @@ -184,30 +199,30 @@ struct _PDCLIB_imaxdiv_t _PDCLIB_intmax rem; }; -/* : time_t - * The C standard doesn't define what representation of time is stored in +/* : time_t + * The C standard doesn't define what representation of time is stored in * time_t when returned by time() , but POSIX defines it to be seconds since the - * UNIX epoch and most appplications expect that. + * UNIX epoch and most appplications expect that. * - * time_t is also used as the tv_sec member of struct timespec, which *is* + * time_t is also used as the tv_sec member of struct timespec, which *is* * defined as a linear count of seconds. * * time_t is defined as a "real type", so may be a floating point type, but with * the presence of the nanosecond accurate struct timespec, and with the lack of - * any functions for manipulating more accurate values of time_t, this is + * any functions for manipulating more accurate values of time_t, this is * probably not useful. */ -#define _PDCLIB_time unsigned long long +#define _PDCLIB_time unsigned long long /* : clock_t * * A count of "clock ticks", where the length of a clock tick is unspecified by - * the standard. The implementation is required to provide a macro, + * the standard. The implementation is required to provide a macro, * CLOCKS_PER_SEC, which is the number of "clock ticks" which corresponds to one * second. * * clock_t may be any real type (i.e. integral or floating), and its type on - * various systems differs. + * various systems differs. * * On XSI systems, CLOCKS_PER_SEC must be defined to 1000000 */ @@ -218,8 +233,8 @@ struct _PDCLIB_imaxdiv_t * * The TIME_UTC parameter is passed to the timespec_get function in order to get * the system time in UTC since an implementation defined epoch (not necessarily - * the same as that used for time_t). That said, on POSIX the obvious - * implementation of timespec_get for TIME_UTC is to wrap + * the same as that used for time_t). That said, on POSIX the obvious + * implementation of timespec_get for TIME_UTC is to wrap * clock_gettime(CLOCK_REALTIME, ...), which is defined as time in UTC since the * same epoch. * @@ -281,9 +296,9 @@ struct _PDCLIB_imaxdiv_t most compilers. */ #ifdef __GNUC__ - #define _PDCLIB_offsetof( type, member ) __builtin_offsetof( type, member ) +#define _PDCLIB_offsetof( type, member ) __builtin_offsetof( type, member ) #else - #define _PDCLIB_offsetof( type, member ) ( (size_t) &( ( (type *) 0 )->member ) ) +#define _PDCLIB_offsetof( type, member ) ( (size_t) &( ( (type *) 0 )->member ) ) #endif /* Variable Length Parameter List Handling () @@ -293,22 +308,21 @@ struct _PDCLIB_imaxdiv_t */ #ifdef __GNUC__ - typedef __builtin_va_list _PDCLIB_va_list; - #define _PDCLIB_va_arg( ap, type ) (__builtin_va_arg( (ap), type )) - #define _PDCLIB_va_copy( dest, src ) (__builtin_va_copy( (dest), (src) )) - #define _PDCLIB_va_end( ap ) (__builtin_va_end( ap ) ) - #define _PDCLIB_va_start( ap, parmN ) (__builtin_va_start( (ap), (parmN) )) +typedef __builtin_va_list _PDCLIB_va_list; +#define _PDCLIB_va_arg( ap, type ) (__builtin_va_arg( (ap), type )) +#define _PDCLIB_va_copy( dest, src ) (__builtin_va_copy( (dest), (src) )) +#define _PDCLIB_va_end( ap ) (__builtin_va_end( ap ) ) +#define _PDCLIB_va_start( ap, parmN ) (__builtin_va_start( (ap), (parmN) )) #elif (defined(__i386__) || defined(__i386) || defined(_M_IX86)) && !(defined(__amd64__) || defined(__x86_64__) || defined(_M_AMD64)) - /* Internal helper macro. va_round is not part of . */ - #define _PDCLIB_va_round( type ) ( (sizeof(type) + sizeof(void *) - 1) & ~(sizeof(void *) - 1) ) - - typedef char * _PDCLIB_va_list; - #define _PDCLIB_va_arg( ap, type ) ( (ap) += (_PDCLIB_va_round(type)), ( *(type*) ( (ap) - (_PDCLIB_va_round(type)) ) ) ) - #define _PDCLIB_va_copy( dest, src ) ( (dest) = (src), (void)0 ) - #define _PDCLIB_va_end( ap ) ( (ap) = (void *)0, (void)0 ) - #define _PDCLIB_va_start( ap, parmN ) ( (ap) = (char *) &parmN + ( _PDCLIB_va_round(parmN) ), (void)0 ) +/* Internal helper macro. va_round is not part of . */ +#define _PDCLIB_va_round( type ) ( (sizeof(type) + sizeof(void *) - 1) & ~(sizeof(void *) - 1) ) +typedef char * _PDCLIB_va_list; +#define _PDCLIB_va_arg( ap, type ) ( (ap) += (_PDCLIB_va_round(type)), ( *(type*) ( (ap) - (_PDCLIB_va_round(type)) ) ) ) +#define _PDCLIB_va_copy( dest, src ) ( (dest) = (src), (void)0 ) +#define _PDCLIB_va_end( ap ) ( (ap) = (void *)0, (void)0 ) +#define _PDCLIB_va_start( ap, parmN ) ( (ap) = (char *) &parmN + ( _PDCLIB_va_round(parmN) ), (void)0 ) #else - #error Compiler/Architecture support please +#error Compiler/Architecture support please #endif /* -------------------------------------------------------------------------- */ @@ -335,7 +349,9 @@ struct _PDCLIB_imaxdiv_t /* Locale --------------------------------------------------------------------*/ -/* Locale method. See _PDCLIB_locale.h */ +/* Locale method. See _PDCLIB_locale.h. If undefined, POSIX per-thread locales + will be disabled. +*/ #define _PDCLIB_LOCALE_METHOD _PDCLIB_LOCALE_METHOD_TSS /* wchar_t encoding */ @@ -398,101 +414,101 @@ struct _PDCLIB_imaxdiv_t The C standard only defines three distinct errno values: ERANGE, EDOM, and EILSEQ. The standard leaves it up to "the implementation" whether there are - any more beyond those three. There is some controversy as to whether errno is - such a good idea at all, so you might want to come up with a different error - reporting facility for your platform. - - Things used to say "Since errno values beyond the three defined by the - standard are not portable anyway (unless you look at POSIX), having your own - error reporting facility would not hurt anybody either." at this point. - However, then somebody birthed C++11 into the world, which copied POSIX's - errno values into C++. Yes, even EINTR. Therefore, this library defines - them. That said, thats nothing stopping you from using your own error - reporting facility for things outside the C library. - - Sometimes the standard says to set errno to indicate an error, but does not - prescribe a value. We will use a value from the following list. If POSIX - defines a value, we use that; otherwise, we use as seems suitable. + any more beyond those three. + + However, C++11 introduced the whole list of POSIX errno values into the + standard, so PDCLib might as well define those as well. - If porting to a system which uses an errno-like reporting system (e.g. a - UNIX), you'll probably want to define them to match what the OS uses + Sometimes the standard says to set errno to indicate an error, but does not + prescribe a value. We will use a value from the following list. If POSIX + defines a value, we use that; otherwise, we use as seems suitable. */ -/* C errno values */ -#define _PDCLIB_ERANGE 1 -#define _PDCLIB_EDOM 2 -#define _PDCLIB_EILSEQ 3 - -/* C++11/POSIX errno values */ -#define _PDCLIB_E2BIG 4 -#define _PDCLIB_ECONNRESET 5 -#define _PDCLIB_EISCONN 6 -#define _PDCLIB_ENOENT 7 -#define _PDCLIB_ENOTRECOVERABLE 8 -#define _PDCLIB_EROFS 9 -#define _PDCLIB_EACCES 10 -#define _PDCLIB_EDEADLK 11 -#define _PDCLIB_EISDIR 12 -#define _PDCLIB_ENOEXEC 13 -#define _PDCLIB_ENOTSOCK 14 -#define _PDCLIB_ESPIPE 15 -#define _PDCLIB_EADDRINUSE 16 -#define _PDCLIB_EDESTADDRREQ 17 -#define _PDCLIB_ELOOP 18 -#define _PDCLIB_ENOLCK 19 -#define _PDCLIB_ENOTSUPP 20 -#define _PDCLIB_ESRCH 21 -#define _PDCLIB_EADDRNOTAVAIL 22 -#define _PDCLIB_EMFILE 23 -#define _PDCLIB_ENOLINK 24 -#define _PDCLIB_ENOTTY 25 -#define _PDCLIB_ETIME 26 -#define _PDCLIB_EAFNOSUPPORT 27 -#define _PDCLIB_EEXIST 28 -#define _PDCLIB_EMLINK 29 -#define _PDCLIB_ENOMEM 30 -#define _PDCLIB_ENXIO 31 -#define _PDCLIB_ETIMEDOUT 32 -#define _PDCLIB_EAGAIN 33 -#define _PDCLIB_EFAULT 34 -#define _PDCLIB_EMSGSIZE 35 -#define _PDCLIB_ENOMSG 36 -#define _PDCLIB_EOPNOTSUPP 37 -#define _PDCLIB_ETXTBSY 38 -#define _PDCLIB_EALREADY 39 -#define _PDCLIB_EFBIG 40 -#define _PDCLIB_ENAMETOOLONG 41 -#define _PDCLIB_ENOPROTOOPT 42 -#define _PDCLIB_EOVERFLOW 43 -#define _PDCLIB_EWOULDBLOCK _PDCLIB_EAGAIN -#define _PDCLIB_EBADF 44 -#define _PDCLIB_EHOSTUNREACH 45 -#define _PDCLIB_ENETDOWN 46 -#define _PDCLIB_ENOSPC 47 -#define _PDCLIB_EOWNERDEAD 48 -#define _PDCLIB_EXDEV 49 -#define _PDCLIB_EBADMSG 50 -#define _PDCLIB_EIDRM 51 -#define _PDCLIB_ENETRESET 52 -#define _PDCLIB_ENOSR 53 -#define _PDCLIB_EPERM 54 -#define _PDCLIB_EBUSY 55 -#define _PDCLIB_ENETUNREACH 56 -#define _PDCLIB_ENOSTR 57 -#define _PDCLIB_EPIPE 58 -#define _PDCLIB_ECANCELED 59 -#define _PDCLIB_EINPROGRESS 60 -#define _PDCLIB_ENFILE 61 -#define _PDCLIB_ENOSYS 62 -#define _PDCLIB_EPROTO 63 -#define _PDCLIB_ECHILD 64 -#define _PDCLIB_EINTR 65 -#define _PDCLIB_ENOBUFS 66 -#define _PDCLIB_ENOTCONN 67 -#define _PDCLIB_EPROTONOSUPPORT 68 -#define _PDCLIB_ECONNABORTED 69 -#define _PDCLIB_EINVAL 70 -#define _PDCLIB_ENODATA 71 -#define _PDCLIB_ENOTDIR 72 -#define _PDCLIB_EPROTOTYPE 73 + +/* These values were taken from Windows 7, MSVC 2010. */ +#define _PDCLIB_E2BIG 7 +#define _PDCLIB_EACCES 13 +#define _PDCLIB_EADDRINUSE 100 +#define _PDCLIB_EADDRNOTAVAIL 101 +#define _PDCLIB_EAFNOSUPPORT 102 +#define _PDCLIB_EAGAIN 11 +#define _PDCLIB_EALREADY 103 +#define _PDCLIB_EBADF 9 +#define _PDCLIB_EBADMSG 104 +#define _PDCLIB_EBUSY 16 +#define _PDCLIB_ECANCELED 105 +#define _PDCLIB_ECHILD 10 +#define _PDCLIB_ECONNABORTED 106 +#define _PDCLIB_ECONNREFUSED 107 +#define _PDCLIB_ECONNRESET 108 +#define _PDCLIB_EDEADLK 36 +#define _PDCLIB_EDESTADDRREQ 109 +#define _PDCLIB_EDOM 33 +#define _PDCLIB_EEXIST 17 +#define _PDCLIB_EFAULT 14 +#define _PDCLIB_EFBIG 27 +#define _PDCLIB_EHOSTUNREACH 110 +#define _PDCLIB_EIDRM 111 +#define _PDCLIB_EILSEQ 42 +#define _PDCLIB_EINPROGRESS 112 +#define _PDCLIB_EINTR 4 +#define _PDCLIB_EINVAL 22 +#define _PDCLIB_EIO 5 +#define _PDCLIB_EISCONN 113 +#define _PDCLIB_EISDIR 21 +#define _PDCLIB_ELOOP 114 +#define _PDCLIB_EMFILE 24 +#define _PDCLIB_EMLINK 31 +#define _PDCLIB_EMSGSIZE 115 +#define _PDCLIB_ENAMETOOLONG 38 +#define _PDCLIB_ENETDOWN 116 +#define _PDCLIB_ENETRESET 117 +#define _PDCLIB_ENETUNREACH 118 +#define _PDCLIB_ENFILE 23 +#define _PDCLIB_ENOBUFS 119 +#define _PDCLIB_ENODATA 120 +#define _PDCLIB_ENODEV 19 +#define _PDCLIB_ENOENT 2 +#define _PDCLIB_ENOEXEC 8 +#define _PDCLIB_ENOLCK 39 +#define _PDCLIB_ENOLINK 121 +#define _PDCLIB_ENOMEM 12 +#define _PDCLIB_ENOMSG 122 +#define _PDCLIB_ENOPROTOOPT 123 +#define _PDCLIB_ENOSPC 28 +#define _PDCLIB_ENOSR 124 +#define _PDCLIB_ENOSTR 125 +#define _PDCLIB_ENOSYS 40 +#define _PDCLIB_ENOTCONN 126 +#define _PDCLIB_ENOTDIR 20 +#define _PDCLIB_ENOTEMPTY 41 +#define _PDCLIB_ENOTRECOVERABLE 127 +#define _PDCLIB_ENOTSOCK 128 +#define _PDCLIB_ENOTSUP 129 +#define _PDCLIB_ENOTTY 25 +#define _PDCLIB_ENXIO 6 +#define _PDCLIB_EOPNOTSUPP 130 +#define _PDCLIB_EOVERFLOW 132 +#define _PDCLIB_EOWNERDEAD 133 +#define _PDCLIB_EPERM 1 +#define _PDCLIB_EPIPE 32 +#define _PDCLIB_EPROTO 134 +#define _PDCLIB_EPROTONOSUPPORT 135 +#define _PDCLIB_EPROTOTYPE 136 +#define _PDCLIB_ERANGE 34 +#define _PDCLIB_EROFS 30 +#define _PDCLIB_ESPIPE 29 +#define _PDCLIB_ESRCH 3 +#define _PDCLIB_ETIME 137 +#define _PDCLIB_ETIMEDOUT 138 +#define _PDCLIB_ETXTBSY 139 +#define _PDCLIB_EWOULDBLOCK 140 +#define _PDCLIB_EXDEV 18 + +/* This is used to set the size of the array in struct lconv () */ +/* holding the error messages for the strerror() and perror() fuctions. If */ +/* you change this value because you are using additional errno values, you */ +/* *HAVE* to provide appropriate error messages for *ALL* locales. */ +/* Needs to be one higher than the highest errno value above. */ +#define _PDCLIB_ERRNO_MAX 141 #endif