From be0dff43dcc58f4f251460eb43d9d5b784e0c633 Mon Sep 17 00:00:00 2001 From: matz Date: Wed, 23 Nov 2005 05:11:18 +0000 Subject: * re.c (KR_REHASH): should cast to unsigned for 64bit CPU. [ruby-core:06721] git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@9594 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- missing/vsnprintf.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'missing/vsnprintf.c') diff --git a/missing/vsnprintf.c b/missing/vsnprintf.c index 3a922b721..11f4de350 100644 --- a/missing/vsnprintf.c +++ b/missing/vsnprintf.c @@ -111,6 +111,13 @@ #endif /* People who don't like const sys_error */ #include +#if defined(__hpux) && !defined(__GNUC__) || defined(__DECC) +#include +#endif + +#if !defined(__CYGWIN32__) && defined(__hpux) && !defined(__GNUC__) +#include +#endif #ifndef NULL #define NULL 0 @@ -194,6 +201,9 @@ typedef struct __sFILE { #define __sclearerr(p) ((void)((p)->_flags &= ~(__SERR|__SEOF))) #define __sfileno(p) ((p)->_file) +#undef feof +#undef ferror +#undef clearerr #define feof(p) __sfeof(p) #define ferror(p) __sferror(p) #define clearerr(p) __sclearerr(p) @@ -203,10 +213,6 @@ typedef struct __sFILE { #endif -#if defined(__hpux) && !defined(__GNUC__) || defined(__DECC) -#include -#endif - /* * I/O descriptors for __sfvwrite(). */ @@ -303,10 +309,6 @@ static int BSD__sfvwrite(fp, uio) * This code is large and complicated... */ -#if !defined(__CYGWIN32__) && defined(__hpux) && !defined(__GNUC__) -#include -#endif - /* * Flush out all the vectors defined by the given uio, * then reset it so that it can be reused. -- cgit