From b61c182da8918c8fee6e38b177002c44aafa9cf2 Mon Sep 17 00:00:00 2001
From: Mike McCormack <mike@codeweavers.com>
Date: Mon, 13 Jun 2005 11:39:52 +0000
Subject: [PATCH] More warning fixes.

---
 programs/rpcss/epmap_server.c |  2 +-
 programs/rpcss/np_server.c    | 18 +++++++++---------
 programs/winefile/license.c   |  5 +++++
 programs/winefile/splitpath.c |  1 +
 4 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/programs/rpcss/epmap_server.c b/programs/rpcss/epmap_server.c
index 5c4d4a79307..7dd67f6eddc 100644
--- a/programs/rpcss/epmap_server.c
+++ b/programs/rpcss/epmap_server.c
@@ -41,7 +41,7 @@ static struct epmap_entry *epmap;
 
 static const UUID nil_object;
 
-char *mystrdup(const char *str) {
+static char *mystrdup(const char *str) {
     char *rval;
     rval = LocalAlloc(LPTR, strlen(str)+1);
     CopyMemory(rval, str, strlen(str)+1);
diff --git a/programs/rpcss/np_server.c b/programs/rpcss/np_server.c
index b2bf05f2eb9..bb90d39f527 100644
--- a/programs/rpcss/np_server.c
+++ b/programs/rpcss/np_server.c
@@ -82,7 +82,7 @@ BOOL RPCSS_UnBecomePipeServer(void)
   return rslt;
 }
 
-void RPCSS_ServerProcessRANMessage(PRPCSS_NP_MESSAGE pMsg, PRPCSS_NP_REPLY pReply)
+static void RPCSS_ServerProcessRANMessage(PRPCSS_NP_MESSAGE pMsg, PRPCSS_NP_REPLY pReply)
 {
   WINE_TRACE("\n");
   /* we do absolutely nothing, but on the server end,
@@ -92,7 +92,7 @@ void RPCSS_ServerProcessRANMessage(PRPCSS_NP_MESSAGE pMsg, PRPCSS_NP_REPLY pRepl
   pReply->as_uint = 0;
 }
 
-void RPCSS_ServerProcessREGISTEREPMessage(PRPCSS_NP_MESSAGE pMsg, PRPCSS_NP_REPLY pReply,
+static void RPCSS_ServerProcessREGISTEREPMessage(PRPCSS_NP_MESSAGE pMsg, PRPCSS_NP_REPLY pReply,
   char *vardata)
 {
   WINE_TRACE("\n");
@@ -110,7 +110,7 @@ void RPCSS_ServerProcessREGISTEREPMessage(PRPCSS_NP_MESSAGE pMsg, PRPCSS_NP_REPL
   pReply->as_uint = 0;
 }
 
-void RPCSS_ServerProcessUNREGISTEREPMessage(PRPCSS_NP_MESSAGE pMsg,
+static void RPCSS_ServerProcessUNREGISTEREPMessage(PRPCSS_NP_MESSAGE pMsg,
   PRPCSS_NP_REPLY pReply, char *vardata)
 {
   WINE_TRACE("\n");
@@ -127,7 +127,7 @@ void RPCSS_ServerProcessUNREGISTEREPMessage(PRPCSS_NP_MESSAGE pMsg,
   pReply->as_uint = 0;
 }
 
-void RPCSS_ServerProcessRESOLVEEPMessage(PRPCSS_NP_MESSAGE pMsg,
+static void RPCSS_ServerProcessRESOLVEEPMessage(PRPCSS_NP_MESSAGE pMsg,
   PRPCSS_NP_REPLY pReply, char *vardata)
 {
   WINE_TRACE("\n");
@@ -142,7 +142,7 @@ void RPCSS_ServerProcessRESOLVEEPMessage(PRPCSS_NP_MESSAGE pMsg,
   );
 }
 
-void RPCSS_ServerProcessMessage(PRPCSS_NP_MESSAGE pMsg, PRPCSS_NP_REPLY pReply, char *vardata)
+static void RPCSS_ServerProcessMessage(PRPCSS_NP_MESSAGE pMsg, PRPCSS_NP_REPLY pReply, char *vardata)
 {
   WINE_TRACE("\n");
   switch (pMsg->message_type) {
@@ -164,7 +164,7 @@ void RPCSS_ServerProcessMessage(PRPCSS_NP_MESSAGE pMsg, PRPCSS_NP_REPLY pReply,
 }
 
 /* each message gets its own thread.  this is it. */
-VOID HandlerThread(LPVOID lpvPipeHandle)
+static VOID HandlerThread(LPVOID lpvPipeHandle)
 {
   RPCSS_NP_MESSAGE msg, vardata_payload_msg;
   char *c, *vardata = NULL;
@@ -251,7 +251,7 @@ VOID HandlerThread(LPVOID lpvPipeHandle)
   InterlockedDecrement(&srv_thread_count);
 }
 
-VOID NPMainWorkThread(LPVOID ignored)
+static VOID NPMainWorkThread(LPVOID ignored)
 {
   BOOL connected;
   HANDLE hthread, master_mutex = RPCSS_GetMasterMutex();
@@ -334,7 +334,7 @@ VOID NPMainWorkThread(LPVOID ignored)
   WINE_TRACE("Server thread shutdown.\n");
 }
 
-HANDLE RPCSS_NPConnect(void)
+static HANDLE RPCSS_NPConnect(void)
 {
   HANDLE the_pipe = NULL;
   DWORD dwmode, wait_result;
@@ -405,7 +405,7 @@ HANDLE RPCSS_NPConnect(void)
   return the_pipe;
 }
 
-BOOL RPCSS_SendReceiveNPMsg(HANDLE np, PRPCSS_NP_MESSAGE msg, PRPCSS_NP_REPLY reply)
+static BOOL RPCSS_SendReceiveNPMsg(HANDLE np, PRPCSS_NP_MESSAGE msg, PRPCSS_NP_REPLY reply)
 {
   DWORD count;
 
diff --git a/programs/winefile/license.c b/programs/winefile/license.c
index 8e666970819..86fba37a5d3 100644
--- a/programs/winefile/license.c
+++ b/programs/winefile/license.c
@@ -17,6 +17,9 @@
 */
 
 #include "windows.h"
+#include "winefile.h"
+
+#ifdef __WINE__
 
 static const CHAR LicenseCaption[] = "LICENSE";
 static const CHAR License[] =
@@ -50,3 +53,5 @@ VOID WineWarranty(HWND hwnd)
 {
   MessageBoxA(hwnd, NoWarranty, NoWarrantyCaption, MB_ICONEXCLAMATION|MB_OK);
 }
+
+#endif
diff --git a/programs/winefile/splitpath.c b/programs/winefile/splitpath.c
index a794cf615ce..b4daf77c61b 100644
--- a/programs/winefile/splitpath.c
+++ b/programs/winefile/splitpath.c
@@ -20,6 +20,7 @@
 #define WIN32_EXTRA_LEAN
 
 #include <windows.h>
+#include "winefile.h"
 
 
 #ifdef __WINE__