summaryrefslogtreecommitdiff
path: root/win32/win32.h
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-07-30 06:10:09 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-07-30 06:10:09 +0000
commit3404b920d6447f42efd18df034142459027ce83d (patch)
tree823a2fec01bca2e312aa4bf77e414756cc4107c8 /win32/win32.h
parentb873f41c1e577168b6322bd96f38b077b44d5314 (diff)
* error.c (rb_raise): snprintf() termination moved to
win32/win32.c. * win32/win32.c (valid_filename, str_grow): unused. * win32/win32.c (NTLoginName, ChildRecord): make static. * win32/win32.c (CreateChild): argument check. * win32/win32.c (kill): should not call CloseHandle() when OpenProcess() failed. * win32/win32.c (rb_w32_vsnprintf, rb_w32_snprintf): ensure buffer terminated. [ruby-talk:69672] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4227 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32/win32.h')
-rw-r--r--win32/win32.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/win32/win32.h b/win32/win32.h
index d04ea376e65..eb13e2b3a14 100644
--- a/win32/win32.h
+++ b/win32/win32.h
@@ -114,8 +114,6 @@ extern "C++" {
#define _open _sopen
#define sopen _sopen
#endif
-#define vsnprintf _vsnprintf
-#define snprintf _snprintf
#define fsync(h) _commit(h)
#undef stat
#define stat(path,st) rb_w32_stat(path,st)
@@ -164,6 +162,11 @@ extern int rb_w32_rename(const char *, const char *);
extern char **rb_w32_get_environ(void);
extern void rb_w32_free_environ(char **);
+#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(char *, char *);
extern int gettimeofday(struct timeval *, struct timezone *);