From 0205a4aee02c80ad6eb09a0ca6cf6c405f1d9604 Mon Sep 17 00:00:00 2001 From: cas Date: Wed, 31 Oct 2001 18:01:39 +0000 Subject: [PATCH] portability --- src/WOKNT/WOKNT_TimeStat.hxx | 4 ++++ src/WOKNT/WOKNT_regexp.h | 5 +++-- src/WOKNT/WOKNT_regexp_1.c | 14 ++++---------- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/src/WOKNT/WOKNT_TimeStat.hxx b/src/WOKNT/WOKNT_TimeStat.hxx index 618780f..ed2f14c 100755 --- a/src/WOKNT/WOKNT_TimeStat.hxx +++ b/src/WOKNT/WOKNT_TimeStat.hxx @@ -1,6 +1,8 @@ #ifndef __WOKNT_FILETIME_HXX # define __WOKNT_FILETIME_HXX +#ifdef WNT + # ifndef STRICT # define STRICT # endif // STRICT @@ -12,3 +14,5 @@ typedef time_t WOKNT_TimeStat; #endif // __WOKNT_FILETIME_HXX + +#endif diff --git a/src/WOKNT/WOKNT_regexp.h b/src/WOKNT/WOKNT_regexp.h index 690539a..8761fda 100755 --- a/src/WOKNT/WOKNT_regexp.h +++ b/src/WOKNT/WOKNT_regexp.h @@ -41,7 +41,7 @@ typedef char _TCHAR; typedef char TCHAR; typedef unsigned char _TUCHAR; -# endif /* WNT */ + /***/ /******************************************************************************/ /* Definitions for data structures callers pass the regex library. */ @@ -280,4 +280,5 @@ REGEXP_API int re_set_syntax ( int ); # endif /* __cplusplus */ /***/ /******************************************************************************/ -#endif /* __REGEXP_H */ +# endif /* __REGEXP_H */ +#endif /* WNT */ diff --git a/src/WOKNT/WOKNT_regexp_1.c b/src/WOKNT/WOKNT_regexp_1.c index 1b9f070..a759199 100755 --- a/src/WOKNT/WOKNT_regexp_1.c +++ b/src/WOKNT/WOKNT_regexp_1.c @@ -31,20 +31,14 @@ # include #endif -#ifdef HAVE_ALLOCA_H -# include -#else /* alloca() non disponible sur HPUX 9.07 */ -# ifdef __cplusplus +#ifdef __cplusplus extern "C" { -# endif +#endif void *alloca(unsigned int); # ifdef __cplusplus } #endif -void *alloca(unsigned int size){return (void *)0L;} -#endif - #include @@ -1468,7 +1462,7 @@ int re_match_2 ( if ( stacke - stackb > RE_MAX_FAILURES ) return -2; - stackx = ( _TUCHAR** ) alloca ( 2 * ( stacke - stackb ) * sizeof ( _TCHAR* ) ); + stackx = ( _TUCHAR** ) alloca( 2 * ( stacke - stackb ) * sizeof ( _TCHAR* ) ); memcpy ( stackx, stackb, ( stacke - stackb ) * sizeof ( _TCHAR* ) ); stackp = stackx + ( stackp - stackb ); stacke = stackx + 2 * ( stacke - stackb ); @@ -1558,7 +1552,7 @@ nofinalize: if ( stackp == stacke ) { _TUCHAR** stackx = - ( _TUCHAR** ) alloca ( 2 * ( stacke - stackb ) * sizeof ( _TUCHAR* ) ); + ( _TUCHAR** ) alloca( 2 * ( stacke - stackb ) * sizeof ( _TUCHAR* ) ); memcpy ( stackx, stackb, (stacke - stackb) * sizeof ( _TCHAR* ) ); stackp = stackx + ( stackp - stackb ); -- 2.39.5