diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/ruby/missing.h | 6 | ||||
| -rw-r--r-- | include/ruby/win32.h | 5 |
2 files changed, 5 insertions, 6 deletions
diff --git a/include/ruby/missing.h b/include/ruby/missing.h index 16d5a6f02b..ea40f62a52 100644 --- a/include/ruby/missing.h +++ b/include/ruby/missing.h @@ -144,9 +144,13 @@ RUBY_EXTERN long strtol(const char *, char **, int); #endif */ -#ifndef HAVE_VSNPRINTF +#if defined HAVE_VSNPRINTF || defined HAVE_SNPRINTF # include <stdarg.h> +#endif +#ifndef HAVE_SNPRINTF RUBY_EXTERN int snprintf(char *, size_t n, char const *, ...); +#endif +#ifndef HAVE_VSNPRINTF RUBY_EXTERN int vsnprintf(char *, size_t n, char const *, va_list); #endif diff --git a/include/ruby/win32.h b/include/ruby/win32.h index bd4d66493b..582348d338 100644 --- a/include/ruby/win32.h +++ b/include/ruby/win32.h @@ -243,11 +243,6 @@ extern char **rb_w32_get_environ(void); extern void rb_w32_free_environ(char **); extern int rb_w32_map_errno(DWORD); -#define vsnprintf(s,n,f,l) rb_w32_vsnprintf(s,n,f,l) -#define snprintf rb_w32_snprintf -extern int rb_w32_vsnprintf(char *, size_t, const char *, va_list); -extern int rb_w32_snprintf(char *, size_t, const char *, ...); - extern int chown(const char *, int, int); extern int link(const char *, const char *); extern int gettimeofday(struct timeval *, struct timezone *); |