Author: Henrik Nordstrom <henrik@henriknordstrom.net>

Windows port: Silence some harmless GCC warnings/errors

diff --git a/lib/sspwin32.c b/lib/sspwin32.c
index 733ead55d6ba137f5ec41fb887f9924f3a91a6fe..6933f5f6d50cdc5adcb1206a19f044cae4719bc5 100644 (file)
--- a/lib/sspwin32.c
+++ b/lib/sspwin32.c
@@ -428,11 +428,11 @@ BOOL WINAPI SSP_LogonUser(PTSTR szUser, PTSTR szPassword, PTSTR szDomain)
 
         /* Initialize auth identity structure */
        ZeroMemory(&ai, sizeof(ai));
-       ai.Domain = szDomain;
+       ai.Domain = (void *)szDomain;
        ai.DomainLength = lstrlen(szDomain);
-       ai.User = szUser;
+       ai.User = (void *)szUser;
        ai.UserLength = lstrlen(szUser);
-       ai.Password = szPassword;
+       ai.Password = (void *)szPassword;
        ai.PasswordLength = lstrlen(szPassword);
 #if defined(UNICODE) || defined(_UNICODE)
        ai.Flags = SEC_WINNT_AUTH_IDENTITY_UNICODE;

diff --git a/src/comm_select_win32.cc b/src/comm_select_win32.cc
index 0498f83bc70057d540ab52e63b2bd994019d991c..1475cdf1fc3e23f71892635958645d330a9dce4b 100644 (file)
--- a/src/comm_select_win32.cc
+++ b/src/comm_select_win32.cc
@@ -684,6 +684,15 @@ comm_select_dns_incoming(void)
     statHistCount(&statCounter.comm_dns_incoming, nevents);
 }
 
+static void
+commSelectRegisterWithCacheManager(void)
+{
+    CacheManager::GetInstance()->
+            registerAction("comm_select_incoming",
+                           "comm_incoming() stats",
+                           commIncomingStats, 0, 1);
+}
+
 void
 comm_select_init(void)
 {

diff --git a/src/win32.cc b/src/win32.cc
index 68cfb236151d143bfab79aef88f1e692f0d525df..91c1740327d72e10049ed9bf01523417d80b2fc7 100644 (file)
--- a/src/win32.cc
+++ b/src/win32.cc
@@ -126,8 +126,10 @@ int WIN32_getrusage(int who, struct rusage *usage)
             FILETIME ftCreate, ftExit, ftKernel, ftUser;
 
             if (GetProcessTimes(hProcess, &ftCreate, &ftExit, &ftKernel, &ftUser)) {
-                int64_t tUser64 = (*(int64_t *)&ftUser / 10);
-                int64_t tKernel64 = (*(int64_t *)&ftKernel / 10);
+               int64_t *ptUser = (int64_t *)&ftUser;
+                int64_t tUser64 = *ptUser / 10;
+               int64_t *ptKernel = (int64_t *)&ftKernel;
+                int64_t tKernel64 = *ptKernel / 10;
                 usage->ru_utime.tv_sec =(long)(tUser64 / 1000000);
                 usage->ru_stime.tv_sec =(long)(tKernel64 / 1000000);
                 usage->ru_utime.tv_usec =(long)(tUser64 % 1000000);