From 26a651f7aef8f51df4320f0adc0179896ee23b95 Mon Sep 17 00:00:00 2001
From: Yang Tse <yangsita@gmail.com>
Date: Thu, 2 Oct 2008 13:28:10 +0000
Subject: fix compiler warning: `variable' might be clobbered by `longjmp' or
 `vfork'

---
 lib/hostip.c         |  2 +-
 tests/server/tftpd.c | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/hostip.c b/lib/hostip.c
index 029019215..f8c2be63f 100644
--- a/lib/hostip.c
+++ b/lib/hostip.c
@@ -524,7 +524,7 @@ int Curl_resolv_timeout(struct connectdata *conn,
                         const char *hostname,
                         int port,
                         struct Curl_dns_entry **entry,
-                        long timeout)
+                        volatile long timeout)
 {
 #ifdef USE_ALARM_TIMEOUT 
 #ifdef HAVE_SIGACTION
diff --git a/tests/server/tftpd.c b/tests/server/tftpd.c
index fc51b6eff..443eea970 100644
--- a/tests/server/tftpd.c
+++ b/tests/server/tftpd.c
@@ -760,9 +760,9 @@ static void timer(int signum)
  */
 static void sendtftp(struct testcase *test, struct formats *pf)
 {
-  struct tftphdr *dp;
-  struct tftphdr *ap;    /* ack packet */
-  unsigned short block = 1;
+  struct tftphdr * volatile dp;
+  struct tftphdr * volatile ap;    /* ack packet */
+  volatile unsigned short block = 1;
   int size;
   ssize_t n;
 #if defined(HAVE_ALARM) && defined(SIGALRM)
@@ -835,9 +835,9 @@ static void justtimeout(int signum)
  */
 static void recvtftp(struct testcase *test, struct formats *pf)
 {
-  struct tftphdr *dp;
-  struct tftphdr *ap;    /* ack buffer */
-  unsigned short block = 0;
+  struct tftphdr * volatile dp;
+  struct tftphdr * volatile ap;    /* ack buffer */
+  volatile unsigned short block = 0;
   ssize_t n, size;
 #if defined(HAVE_ALARM) && defined(SIGALRM)
   mysignal(SIGALRM, timer);
-- 
cgit v1.2.3