X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=internals%2F_PDCLIB_aux.h;h=986807e18b7d818f2e04ae449c731a17b9cd7bc6;hb=e6d28b5afddd8b3e3564af2264aa8b705e711b67;hp=e7e908a66e413d70cee645fc2ad26b8e0749049d;hpb=219271fd548949abce8bd75c34dd42e519418fc4;p=pdclib

diff --git a/internals/_PDCLIB_aux.h b/internals/_PDCLIB_aux.h
index e7e908a..986807e 100644
--- a/internals/_PDCLIB_aux.h
+++ b/internals/_PDCLIB_aux.h
@@ -23,28 +23,28 @@
 #endif
 
 #if defined(_PDCLIB_C_VERSION)
-	/* Pass - conditional simplification case */
+    /* Pass - conditional simplification case */
 #elif !defined(__STDC_VERSION__)
-	#define _PDCLIB_C_VERSION 1990
+    #define _PDCLIB_C_VERSION 1990
 #elif __STDC_VERSION__ == 199409L
-	#define _PDCLIB_C_VERSION 1995
+    #define _PDCLIB_C_VERSION 1995
 #elif __STDC_VERSION__ == 199901L
-	#define _PDCLIB_C_VERSION 1999
+    #define _PDCLIB_C_VERSION 1999
 #elif __STDC_VERSION__ == 201112L
-	#define _PDCLIB_C_VERSION 2011
+    #define _PDCLIB_C_VERSION 2011
 #else
-	#error Unsupported _ _STDC_VERSION_ _ (__STDC_VERSION__) (supported: ISO/IEC 9899:1990, 9899/AMD1:1995, 9899:1999, 9899:2011).
+    #error Unsupported _ _STDC_VERSION_ _ (__STDC_VERSION__) (supported: ISO/IEC 9899:1990, 9899/AMD1:1995, 9899:1999, 9899:2011).
 #endif
 
 #if !defined(__cplusplus) || defined(_PDCLIB_CXX_VERSION)
    #define _PDCLIB_CXX_VERSION 0
 #elif __cplusplus == 201103L
-	#define _PDCLIB_CXX_VERSION 2011
+    #define _PDCLIB_CXX_VERSION 2011
     /* TODO: Do we want this? */
-	#if _PDCLIB_C_VERSION < 2011
-		#undef _PDCLIB_C_VERSION
-   		#define _PDCLIB_C_VERSION 2011
-	#endif
+    #if _PDCLIB_C_VERSION < 2011
+        #undef _PDCLIB_C_VERSION
+        #define _PDCLIB_C_VERSION 2011
+    #endif
 #elif __cplusplus == 199711L
    #define _PDCLIB_CXX_VERSION 1997
 #else
@@ -52,17 +52,25 @@
 #endif
 
 #if _PDCLIB_C_VERSION >= 1999 || defined(__cplusplus)
-	#ifndef __cplusplus
-		#define _PDCLIB_restrict restrict
-  	#endif
-	#define _PDCLIB_inline   inline
+    #ifndef __cplusplus
+        #define _PDCLIB_restrict restrict
+    #endif
+    #define _PDCLIB_inline   inline
+#endif
+
+#if _PDCLIB_CXX_VERSION >= 2011
+  #define _PDCLIB_nothrow     noexcept
+  #define _PDCLIB_noexcept(x) noexcept(x)
+#elif _PDCLIB_CXX_VERSION
+  #define _PDCLIB_nothrow     throw()
+  #define _PDCLIB_noexcept
 #endif
 
 #if _PDCLIB_CXX_VERSION >= 2011
   // Hold off on C++ attribute syntax for now
   // #define _PDCLIB_noreturn [[noreturn]]
 #elif _PDCLIB_C_VERSION >= 2011
-	#define _PDCLIB_noreturn _Noreturn
+    #define _PDCLIB_noreturn _Noreturn
 #endif
 
 #ifdef _WIN32
@@ -71,62 +79,80 @@
 #endif
 
 #ifdef __GNUC__
-	#ifndef _PDCLIB_EXPORT
-   		#define _PDCLIB_EXPORT __attribute__((__visibility__("protected")))
-   	#endif
+    #ifndef _PDCLIB_EXPORT
+        #define _PDCLIB_EXPORT __attribute__((__visibility__("protected")))
+    #endif
 
-   	#ifndef _PDCLIB_IMPORT
-		#define _PDCLIB_IMPORT
-   	#endif
+    #ifndef _PDCLIB_IMPORT
+        #define _PDCLIB_IMPORT
+    #endif
 
-   	#ifndef _PDCLIB_HIDDEN
-   		#define _PDCLIB_HIDDEN __attribute__((__visibility__("hidden")))
-   	#endif
+    #ifndef _PDCLIB_HIDDEN
+        #define _PDCLIB_HIDDEN __attribute__((__visibility__("hidden")))
+    #endif
 
-	#ifndef _PDCLIB_restrict
-		#define _PDCLIB_restrict __restrict
-	#endif
+    #ifndef _PDCLIB_nothrow
+      #define _PDCLIB_nothrow __attribute__((__nothrow__))
+      #define _PDCLIB_noexcept
+    #endif
 
-	#ifndef _PDCLIB_inline
-		#define _PDCLIB_inline __inline
-	#endif
+    #ifndef _PDCLIB_restrict
+        #define _PDCLIB_restrict __restrict
+    #endif
+
+    #ifndef _PDCLIB_inline
+        #define _PDCLIB_inline __inline
+    #endif
 
-	#ifndef _PDCLIB_noreturn
+    #ifndef _PDCLIB_noreturn
     /* If you don't use __noreturn__, then stdnoreturn.h will break things! */
-		#define _PDCLIB_noreturn __attribute__((__noreturn__))
-	#endif
+        #define _PDCLIB_noreturn __attribute__((__noreturn__))
+    #endif
+
+    #ifndef _PDCLIB_DEPRECATED
+        #define _PDCLIB_DEPRECATED __attribute__ ((deprecated))
+    #endif
+#endif
+
+#ifndef _PDCLIB_nothrow
+  #define _PDCLIB_nothrow
+  #define _PDCLIB_noexcept
 #endif
 
 #ifndef _PDCLIB_EXPORT
-   	#define _PDCLIB_EXPORT
+    #define _PDCLIB_EXPORT
 #endif
 #ifndef _PDCLIB_IMPORT
-   	#define _PDCLIB_IMPORT
+    #define _PDCLIB_IMPORT
 #endif
 #ifndef _PDCLIB_HIDDEN
-   	#define _PDCLIB_HIDDEN
+    #define _PDCLIB_HIDDEN
 #endif
 
 #if defined(_PDCLIB_SHARED) 
-   	#if defined(_PDCLIB_BUILD)
-   		#define _PDCLIB_API _PDCLIB_EXPORT
-   	#else
-   		#define _PDCLIB_API _PDCLIB_IMPORT
-   	#endif
+    #if defined(_PDCLIB_BUILD)
+        #define _PDCLIB_API _PDCLIB_EXPORT
+    #else
+        #define _PDCLIB_API _PDCLIB_IMPORT
+    #endif
 #else
-   	#define _PDCLIB_API
+    #define _PDCLIB_API
 #endif
 
 #ifndef _PDCLIB_restrict
-	#define _PDCLIB_restrict
+      #define _PDCLIB_restrict
 #endif
 
 #ifndef _PDCLIB_inline
-	#define _PDCLIB_inline
+      #define _PDCLIB_inline
 #endif
 
 #ifndef _PDCLIB_noreturn
-	#define _PDCLIB_noreturn
+      #define _PDCLIB_noreturn
+#endif
+
+#ifndef _PDCLIB_DEPRECATED
+    #define _PDCLIB_DEPRECATED
 #endif
 
 #ifndef __STDC_HOSTED__
@@ -140,11 +166,13 @@
 #endif
 
 #ifdef __cplusplus
-	#define _PDCLIB_BEGIN_EXTERN_C extern "C" {
-	#define _PDCLIB_END_EXTERN_C }
+    #define _PDCLIB_BEGIN_EXTERN_C extern "C" {
+    #define _PDCLIB_END_EXTERN_C }
+  typedef bool _PDCLIB_bool;
 #else
-   #define _PDCLIB_BEGIN_EXTERN_C
-   #define _PDCLIB_END_EXTERN_C
+  #define _PDCLIB_BEGIN_EXTERN_C
+  #define _PDCLIB_END_EXTERN_C
+  typedef _Bool _PDCLIB_bool;
 #endif
 
 /*#if _PDCLIB_C_VERSION != 1999
@@ -159,6 +187,7 @@
 
 #define _PDCLIB_cc( x, y )     x ## y
 #define _PDCLIB_concat( x, y ) _PDCLIB_cc( x, y )
+#define _PDCLIB_concat3( x, y, z ) _PDCLIB_concat( _PDCLIB_concat( x, y ), z )
 
 #define _PDCLIB_symbol2value( x ) #x
 #define _PDCLIB_symbol2string( x ) _PDCLIB_symbol2value( x )
@@ -166,9 +195,9 @@
 /* Feature test macros
  *
  * All of the feature test macros come in the following forms
- *   _PDCLIB_*_MIN(min):            Available in versions > min
- *   _PDCLIB_*_MINMAX(min, max):    Available in versions > min < max
- *   _PDCLIB_*_MAX(max):            Availabel in versions < max
+ *   _PDCLIB_*_MIN(min):            Available in versions >= min
+ *   _PDCLIB_*_MINMAX(min, max):    Available in versions >= min <= max
+ *   _PDCLIB_*_MAX(max):            Availabel in versions <= max
  *
  * The defined tests are:
  *   C:     C standard versions 
@@ -181,10 +210,21 @@
  *   XOPEN: X/Open System Interface (XSI)/Single Unix Specification
  *              0 (XPG4), 500 (SUSv2/UNIX98), 600 (SUSv3/UNIX03), 700 (SUSv4)
  *
- * PDCLib does not attempt or claim POSIX comformance, but makes available these
- * extensions as
- *   (a) useful, and
- *   (b) 
+ *   Additionally, the macros
+ *     _BSD_SOURCE, _SVID_SOURCE and _GNU_SOURCE
+ *   are adhered to. If _GNU_SOURCE is defined, _XOPEN_SOURCE and 
+ *   _POSIX_C_SOURCE are defined to their most recent values to match glibc 
+ *   behaviour
+ *
+ *   The intention of supporting these feature test macros is to ease 
+ *   application portability from these systems to PDCLib systems; in addition,
+ *   it eases support for these standards by systems supporting them which are 
+ *   using PDCLib as their default C library.
+ *
+ *   Applications targetting purely PDClib/PDCLib based platforms may define 
+ *   just _PDCLIB_EXTENSIONS, which will enable all supported extensions, plus
+ *   all features from all supported versions of C and C++.
+ *
  */
 #define _PDCLIB_C_MIN(min)         _PDCLIB_C_MINMAX(min, 3000)
 #define _PDCLIB_CXX_MIN(min)     _PDCLIB_CXX_MINMAX(min, 3000)
@@ -199,6 +239,16 @@
     #define _PDCLIB_CXX_MINMAX(min, max) 1
     #define _PDCLIB_POSIX_MINMAX(min, max) 1
     #define _PDCLIB_XOPEN_MINMAX(min, max) 1
+
+    #undef _PDCLIB_EXTENSIONS
+    #undef _PDCLIB_BSD_SOURCE 
+    #undef _PDCLIB_SVID_SOURCE
+    #undef _PDCLIB_GNU_SOURCE
+
+    #define _PDCLIB_EXTENSIONS 1
+    #define _PDCLIB_BSD_SOURCE 1
+    #define _PDCLIB_SVID_SOURCE 1
+    #define _PDCLIB_GNU_SOURCE 1
 #else
     #define _PDCLIB_C_MINMAX(min, max) \
         (_PDCLIB_C_VERSION >= (min) && _PDCLIB_C_VERSION <= (max))
@@ -217,6 +267,32 @@
         #define _XOPEN_SOURCE 0
     #endif
 
+    #if defined(_GNU_SOURCE)
+        #define _PDCLIB_GNU_SOURCE 1
+        #define _PDCLIB_SVID_SOURCE 1
+        #define _PDCLIB_BSD_SOURCE 1
+        #undef _XOPEN_SOURCE
+        #define _XOPEN_SOURCE 700
+    #else
+        #define _PDCLIB_GNU_SOURCE 0
+    #endif
+
+    #if defined(_PDCLIB_BSD_SOURCE)
+        // pass
+    #elif defined(_BSD_SOURCE)
+        #define _PDCLIB_BSD_SOURCE 1
+    #else
+        #define _PDCLIB_BSD_SOURCE 0
+    #endif
+
+    #if defined(_PDCLIB_SVID_SOURCE)
+        // pass
+    #elif defined(_SVID_SOURCE)
+        #define _PDCLIB_SVID_SOURCE 1
+    #else
+        #define _PDCLIB_SVID_SOURCE 0
+    #endif
+
     #if _PDCLIB_XOPEN_MIN(700) && !_PDCLIB_POSIX_MIN(200809L)
         #undef _POSIX_C_SOURCE
         #define _POSIX_C_SOURCE 2008098L    
@@ -233,4 +309,4 @@
     #endif
 #endif
 
-#endif
\ No newline at end of file
+#endif