--- parser3/src/include/pa_config_includes.h 2004/06/22 14:12:57 1.29 +++ parser3/src/include/pa_config_includes.h 2020/12/15 17:10:30 1.66 @@ -1,7 +1,7 @@ /** @file Parser: includes all Configure-d headers - Copyright (c) 2001-2004 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001-2020 Art. Lebedev Studio (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) when used Configure [HAVE_CONFIG_H] it uses defines from Configure, @@ -11,145 +11,160 @@ #ifndef PA_CONFIG_INCLUDES_H #define PA_CONFIG_INCLUDES_H -#if _MSC_VER -# pragma warning(disable:4291) // disable warning -// "no matching operator delete found; memory will not be freed if initialization throws an exception -#endif - #if HAVE_CONFIG_H -# include "pa_config_auto.h" +# include "pa_config_auto.h" #else -# include "pa_config_fixed.h" +# include "pa_config_fixed.h" #endif -#ifdef __cplusplus -# undef inline +// AC_INCLUDES_DEFAULT + +#ifdef HAVE_STDIO_H +# include #endif -#ifdef HAVE_ASSERT_H -# include +#ifdef HAVE_SYS_TYPES_H +# include #endif -#ifdef HAVE_CTYPE_H -# include +#ifdef HAVE_SYS_STAT_H +# include #endif -#ifdef HAVE_ERRNO_H -# include +#ifdef HAVE_STDLIB_H +# include #endif -#ifdef HAVE_FCNTL_H -# include +#ifdef HAVE_STDDEF_H +# include #endif -#ifdef HAVE_IO_H -# include +#ifdef HAVE_STRING_H +# if !defined STDC_HEADERS && defined HAVE_MEMORY_H +# include +# endif +# include #endif -#ifdef HAVE_PROCESS_H -# include +#ifdef HAVE_STRINGS_H +# include #endif -#ifdef HAVE_STDARG_H -# include +#ifdef HAVE_INTTYPES_H +# include #endif -#ifdef HAVE_STDDEF_H -# include +#ifdef HAVE_STDINT_H +# include #endif -#ifdef HAVE_STDIO_H -# include +#ifdef HAVE_UNISTD_H +# include #endif -#ifdef HAVE_SYS_STAT_H -# include +// other includes + +#ifdef HAVE_ASSERT_H +# include #endif -#if defined(HAVE_UNISTD_H) && !defined(NO_UNISTD_H) -# include +#ifdef HAVE_LIMITS_H +# include #endif -#ifdef HAVE_MATH_H -# include +#ifdef HAVE_CTYPE_H +# include #endif -#include +#ifdef HAVE_MATH_H +# include +#endif -#ifdef HAVE_STRING_H -# include +#ifdef HAVE_PROCESS_H +# include #endif -#ifdef HAVE_DIRECT_H -# include +#ifdef HAVE_STDARG_H +# include #endif #ifdef HAVE_SETJMP_H -# include +# include #endif -#ifdef HAVE_MEMORY_H -# include +#ifdef HAVE_SIGNAL_H +# include #endif -#ifdef HAVE_NEW -#include +#ifdef HAVE_PTHREAD_H +# include #endif -#ifdef HAVE_SYS_FILE_H -#include +#ifdef HAVE_ERRNO_H +# include #endif -#ifdef HAVE_SYS_LOCKING_H -#include +#ifdef HAVE_DIRENT_H +# include #endif -#ifdef HAVE_SYS_TYPES_H -#include +#ifdef HAVE_FCNTL_H +# include #endif -#ifdef HAVE_SYS_SELECT_H -#include +#ifdef HAVE_IO_H +# include #endif -#ifdef HAVE_SIGNAL_H -#include +#ifdef HAVE_SYS_FILE_H +# include #endif -#ifdef HAVE_SYS_SOCKET_H -# include -#else -# if defined(HAVE_WINSOCK_H) && !defined(_MSC_VER) && !defined(CYGWIN) -# include -# endif +#ifdef HAVE_SYS_LOCKING_H +# include #endif -// must go anywhere after winsock [cygwin time.h checks for already inclusion of winsock.h] -#if TIME_WITH_SYS_TIME -# include -# include -#else -# ifdef HAVE_SYS_TIME_H -# include -# else -# include -# endif +#ifdef HAVE_SYS_SELECT_H +# include +#endif + +#ifdef HAVE_SYS_RESOURCE_H +# include #endif +#ifdef HAVE_SYS_WAIT_H +# include +#endif + + +#ifdef HAVE_SYS_SOCKET_H +# include +#endif #ifdef HAVE_NETINET_IN_H -#include +# include #endif #ifdef HAVE_ARPA_INET_H -#include +# include #endif #ifdef HAVE_NETDB_H -#include +# include #endif +#if TIME_WITH_SYS_TIME +# include +# include +#else +# ifdef HAVE_SYS_TIME_H +# include +# else +# include +# endif +#endif + // math function replacements #ifdef __cplusplus @@ -173,50 +188,66 @@ inline size_t max(size_t a, size_t b) { inline size_t min(size_t a, size_t b){ return a