From 2807bd47af467c866d717015bbff4a46000e59aa Mon Sep 17 00:00:00 2001
From: usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 11 Dec 2004 03:44:40 +0000
Subject: [PATCH] * eval.c (run_trap_eval): prototype; avoid VC++ warnings.

* ext/socket/getaddrinfo.c: fix typo. fixed: [ruby-core:03947]

* win32/win32.c: need to include dln.h.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@7531 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog                | 8 ++++++++
 eval.c                   | 1 +
 ext/socket/getaddrinfo.c | 2 +-
 win32/win32.c            | 3 ++-
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 31f9f28b2b..307ad599ed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Sat Dec 11 12:41:55 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* eval.c (run_trap_eval): prototype; avoid VC++ warnings.
+
+	* ext/socket/getaddrinfo.c: fix typo. fixed: [ruby-core:03947]
+
+	* win32/win32.c: need to include dln.h.
+
 Sat Dec 11 00:10:18 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* io.c (io_reopen): [ruby-dev:25150]
diff --git a/eval.c b/eval.c
index b6d074d151..5296d35ff4 100644
--- a/eval.c
+++ b/eval.c
@@ -9565,6 +9565,7 @@ thread_reset_raised()
 
 static void rb_thread_ready _((rb_thread_t));
 
+static VALUE run_trap_eval _((VALUE));
 static VALUE
 run_trap_eval(arg)
     VALUE arg;
diff --git a/ext/socket/getaddrinfo.c b/ext/socket/getaddrinfo.c
index 5145982320..9fb4ebcb06 100644
--- a/ext/socket/getaddrinfo.c
+++ b/ext/socket/getaddrinfo.c
@@ -40,7 +40,7 @@
 
 #include "config.h"
 #include <sys/types.h>
-#if !defined(__WIN32) && !defined(__VMS)
+#if !defined(_WIN32) && !defined(__VMS)
 #include <sys/param.h>
 #if defined(__BEOS__)
 # include <net/socket.h>
diff --git a/win32/win32.c b/win32/win32.c
index 78e40a6c96..d4deec8d0a 100644
--- a/win32/win32.c
+++ b/win32/win32.c
@@ -12,6 +12,7 @@
 
 #include "ruby.h"
 #include "rubysig.h"
+#include "dln.h"
 #include <fcntl.h>
 #include <process.h>
 #include <sys/stat.h>
@@ -88,7 +89,7 @@
 
 bool NtSyncProcess = TRUE;
 
-static struct ChildRecord *CreateChild(char *, char *, SECURITY_ATTRIBUTES *, HANDLE, HANDLE, HANDLE);
+static struct ChildRecord *CreateChild(const char *, const char *, SECURITY_ATTRIBUTES *, HANDLE, HANDLE, HANDLE);
 static bool has_redirection(const char *);
 static void StartSockets ();
 static DWORD wait_events(HANDLE event, DWORD timeout);