Added size_t to stdlib.h, added redefinition guards, adjusted includes.

[pdclib] / includes / stdlib.h

diff --git a/includes/stdlib.h b/includes/stdlib.h
index 610f71c4ca40b6aabc7d7a1e44d824872ac3e236..e436c6f18d3cfcb795a656e953ad231ead9c3268 100644 (file)
--- a/includes/stdlib.h
+++ b/includes/stdlib.h
@@ -1,122 +1,80 @@
-// ----------------------------------------------------------------------------
-// $Id$
-// ----------------------------------------------------------------------------
-// Public Domain C Library - http://pdclib.sourceforge.net
-// This code is Public Domain. Use, modify, and redistribute at will.
-// ----------------------------------------------------------------------------
-// General utilities
-// ----------------------------------------------------------------------------
+/* $Id$ */
 
-#ifndef __STDLIB_H
-#define __STDLIB_H __STDLIB_H
+/* Release $Name$ */
 
-// TODO: Documentation, C++ handling
+/* General utilities <stdlib.h>
 
-// ----------------------------------------------------------------------------
-// MACROS
+   This file is part of the Public Domain C Library (PDCLib).
+   Permission is granted to use, modify, and / or redistribute at will.
+*/
 
-#define EXIT_FAILURE // TODO
-#define EXIT_SUCCESS // TODO
-#define MB_CUR_MAX   // TODO
-#define NULL         0
-#define RAND_MAX     // TODO
+#ifndef _PDCLIB_STDLIB_H
+#define _PDCLIB_STDLIB_H _PDCLIB_STDLIB_H
 
-// ----------------------------------------------------------------------------
-// TYPEDEFS
+#ifndef _PDCLIB_INT_H
+#define _PDCLIB_INT_H _PDCLIB_INT_H
+#include <_PDCLIB_int.h>
+#endif
 
-typedef struct
-{
-    int quotient;
-    int remainder;
-} div_t;
+typedef struct _PDCLIB_div_t     div_t;
+typedef struct _PDCLIB_ldiv_t   ldiv_t;
+typedef struct _PDCLIB_lldiv_t lldiv_t;
 
-typedef struct
-{
-    long quotient;
-    long remainder;
-} ldiv_t;
+#ifndef _PDCLIB_SIZE_T_DEFINED
+#define _PDCLIB_SIZE_T_DEFINED _PDCLIB_SIZE_T_DEFINED
+typedef _PDCLIB_size_t size_t;
+#endif
 
-typedef struct
-{   long long quotient;
-    long long remainder;
-} lldiv_t;
+#define NULL         _PDCLIB_NULL
+#define EXIT_SUCCESS _PDCLIB_SUCCESS;
+#define EXIT_FAILURE _PDCLIB_FAILURE;
 
-typedef size_t; // TODO - personality?
+/* Numeric conversion functions */
 
-#ifndef __cplusplus
-typedef wchar_t; // TODO - personality?
-#endif // __cplusplus
+int atoi( const char * nptr );
+long int atol( const char * nptr );
+long long int atoll( const char * nptr );
 
-// ----------------------------------------------------------------------------
-// FUNCTIONS - C++
+long int strtol( const char * _PDCLIB_restrict nptr, char * * _PDCLIB_restrict endptr, int base );
+long long int strtoll( const char * _PDCLIB_restrict nptr, char * * _PDCLIB_restrict endptr, int base );
+unsigned long int strtoul( const char * _PDCLIB_restrict nptr, char * * _PDCLIB_restrict endptr, int base );
+unsigned long long int strtoull( const char * _PDCLIB_restrict nptr, char * * _PDCLIB_restrict endptr, int base );
 
-#ifdef __cplusplus
+/* Pseudo-random sequence generation functions */
 
-long abs( long i );
-long long abs( long long i );
+extern unsigned long int _PDCLIB_seed;
 
-ldiv_t div( long numer, long denom );
-lldiv_t div( long long numer, long long denom );
+#define RAND_MAX 32767
 
-#endif // __cplusplus
+int rand();
+void srand( unsigned int seed );
 
-// ----------------------------------------------------------------------------
-// FUNCTIONS - Standard C
+/* Memory management functions */
 
-int abs( int i );
-long long llabs( long long i );
-long labs( long i );
 
-div_t div( int numer, int denom );
-lldiv_t lldiv( long long numer, long long denom );
-ldiv_t ldiv( long numer, long denom );
+/* Communication with the environment */
 
-int rand( void );
-void srand( unsigned int seed );
+void abort();
+void exit();
 
-double atof( const char * s );
-int atoi( const char * s );
-long atol( const char * s );
-long long atoll( const char * s);
+/* Searching and sorting */
 
-double strtod( const char * restrict s, char * * restrict endptr );
-float strtof( const char * restrict s, char * * restrict endptr );
-long double strtold( const char * restrict s, char * * restrict endptr );
 
-long long strtoll( const char * restrict s, char * * restrict endptr, int base );
-unsigned long long strtoull( const char * restrict s, char * * restrict endptr, int base);
+/* Integer arithmetic functions */
 
-long strtol( const char * restrict s, char * * restrict endptr, int base );
-unsigned long strtoul( const char * restrict s, char * * restrict endptr, int base);
+int abs( int j );
+long int labs( long int j );
+long long int llabs( long long int j );
 
-void * calloc( size_t nelem, size_t size );
-void free( void * ptr );
-void * malloc( size_t size );
-void * realloc( void * ptr, size_t size );
-
-int mblen( const char * s, size_t n );
-size_t mbstowcs( wchar_t * restrict wcs, const char * restrict s, size_t n );
-int mbtowc( wchar_t * restrict pwc, const char * restrict s, size_t n );
-size_t wcstombs( char * restrict s, const wchar_t * restrict wcs, size_t n );
-int wctomb( char * s, wchar_t wchar );
+div_t div( int numer, int denom );
+ldiv_t ldiv( long int numer, long int denom );
+lldiv_t lldiv( long long int numer, long long int denom );
 
-void _Exit( int status );
-void exit( int status );
-void abort( void );
-char * getenv( const char * name );
-int system( const char * s );
+/* Multibyte / wide character conversion functions */
 
-#ifdef __cplusplus
-#define __cppwrapper( x ) extern "C++" x \
-extern "C" x
-#else
-#define __cppwrapper( x ) x
-#endif // __cplusplus
+/* TODO: Macro MB_CUR_MAX */
 
-__cppwrapper( int atexit( void (*func) ( void ) ) { /* TODO */ }; )
-__cppwrapper( void * bsearch( const void * key, const void * base, size_t nelem, size_t size, int (*cmp) ( const void * ck, const void * ce) ) { /* TODO */ }; )
-__cppwrapper( void qsort( void * base, size_t nelem, size_t size, int (*cmp) ( const void * e1, const void * e2) ) { /* TODO */ }; )
+/* Multibyte / wide string conversion functions */
 
-#undef __cppwrapper
 
-#endif // __STDLIB_H
+#endif