--- parser3/src/include/pa_common.h 2001/11/08 14:08:54 1.61 +++ parser3/src/include/pa_common.h 2001/11/14 13:10:30 1.65 @@ -4,7 +4,7 @@ Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) Author: Alexander Petrosyan (http://paf.design.ru) - $Id: pa_common.h,v 1.61 2001/11/08 14:08:54 paf Exp $ + $Id: pa_common.h,v 1.65 2001/11/14 13:10:30 paf Exp $ */ #ifndef PA_COMMON_H @@ -17,6 +17,21 @@ class Value; #if _MSC_VER +// system one called "_snprintf" +#else +// remember system one +inline int _vsnprintf(char *b, size_t s, const char *f, va_list l) { return snprintf(b, s, f, l); } +#endif + +// replace system s*nprintf with our versions +#undef vsnpritnf +int __vsnprintf(char *, size_t, const char *, va_list); +#define vsnprintf __vsnprintf +#undef snprintf +int __snprintf(char *, size_t, const char *, ...); +#define snprintf __snprintf + +#if _MSC_VER /* inline int open( const char *filename, int oflag ) { return _open(filename, oflag); } inline int close( int handle ) { return _close(handle); } @@ -26,15 +41,6 @@ inline int stat( const char *path, struc inline long lseek( int handle, long offset, int origin ) { return _lseek(handle, offset, origin); } */ -#ifndef vsnprintf -int __vsnprintf(char *, size_t, const char *, va_list); -# define vsnprintf __vsnprintf -#endif -#ifndef snprintf -int __snprintf(char *, size_t, const char *, ...); -# define snprintf __snprintf -#endif - //access #define F_OK 0 #define X_OK 1 @@ -85,8 +91,8 @@ inline double sign(double param) { retur can't say that about other systems/ line break styles */ void fix_line_breaks( - char *cstr, ///< nevertheless must be 0 ended - size_t& size ///< used to speedup next actions + char *buf, + size_t& size ///< may change! used to speedup next actions ); /**