httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject cvs commit: httpd-2.0/support/win32 ApacheMonitor.c
Date Wed, 06 Oct 2004 13:33:29 GMT
ake         2004/10/06 06:33:29

  Modified:    modules/arch/win32 mod_win32.c
               server/mpm/winnt service.c
               support/win32 ApacheMonitor.c
  Log:
  WIN64: fix some windows specific 64bit warnings
  
  Revision  Changes    Path
  1.29      +1 -1      httpd-2.0/modules/arch/win32/mod_win32.c
  
  Index: mod_win32.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/arch/win32/mod_win32.c,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- mod_win32.c	9 Feb 2004 20:29:17 -0000	1.28
  +++ mod_win32.c	6 Oct 2004 13:33:29 -0000	1.29
  @@ -108,7 +108,7 @@
   {
       const char *ch = *str;
       char *ch2;
  -    int widen = 0;
  +    apr_size_t widen = 0;
   
       if (!ch) {
           return;
  
  
  
  1.64      +2 -2      httpd-2.0/server/mpm/winnt/service.c
  
  Index: service.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/winnt/service.c,v
  retrieving revision 1.63
  retrieving revision 1.64
  diff -u -r1.63 -r1.64
  --- service.c	9 Feb 2004 20:40:51 -0000	1.63
  +++ service.c	6 Oct 2004 13:33:29 -0000	1.64
  @@ -134,7 +134,7 @@
       hConErr = GetStdHandle(STD_ERROR_HANDLE);
       if ((hConIn == INVALID_HANDLE_VALUE) || (hConErr == INVALID_HANDLE_VALUE))
           return;
  -    if (!WriteConsole(hConErr, msg, strlen(msg), &result, NULL) || !result)
  +    if (!WriteConsole(hConErr, msg, (int)strlen(msg), &result, NULL) || !result)
           return;
       if (!GetConsoleScreenBufferInfo(hConErr, &coninfo))
           return;
  @@ -159,7 +159,7 @@
           sprintf (count, "%d...", remains);
           if (!SetConsoleCursorPosition(hConErr, coninfo.dwCursorPosition))
               return;
  -        if (!WriteConsole(hConErr, count, strlen(count), &result, NULL) 
  +        if (!WriteConsole(hConErr, count, (int)strlen(count), &result, NULL) 
                   || !result)
               return;
       }
  
  
  
  1.27      +4 -4      httpd-2.0/support/win32/ApacheMonitor.c
  
  Index: ApacheMonitor.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/support/win32/ApacheMonitor.c,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- ApacheMonitor.c	9 Feb 2004 20:40:52 -0000	1.26
  +++ ApacheMonitor.c	6 Oct 2004 13:33:29 -0000	1.27
  @@ -492,7 +492,7 @@
   
   static void addListBoxItem(HWND hDlg, LPSTR lpStr, HBITMAP hBmp) 
   { 
  -    int nItem; 
  +    LRESULT nItem; 
    
       nItem = SendMessage(hDlg, LB_ADDSTRING, 0, (LPARAM)lpStr); 
       SendMessage(hDlg, LB_SETITEMDATA, nItem, (LPARAM)hBmp); 
  @@ -688,7 +688,7 @@
           sPos = strstr(szImagePath, "-k start");
           if (sPos)
           {
  -            lstrcpyn(szBuf, szImagePath, sPos - szImagePath);
  +            lstrcpyn(szBuf, szImagePath, (int)(sPos - szImagePath));
               switch (dwCommand)
               {
               case SERVICE_CONTROL_STOP:
  @@ -1142,7 +1142,7 @@
       int i, y; 
       HDC hdcMem; 
       RECT rcBitmap; 
  -    UINT nItem;
  +    LRESULT nItem;
       LPMEASUREITEMSTRUCT lpmis; 
       LPDRAWITEMSTRUCT lpdis; 
   
  @@ -1324,7 +1324,7 @@
                  SetBkColor(lpdis->hDC, GetSysColor(COLOR_WINDOW)); 
                  FillRect(lpdis->hDC, &rcBitmap, (HBRUSH)(COLOR_WINDOW+1)); 
               }
  -            TextOut(lpdis->hDC, XBITMAP + 6, y, szBuf, strlen(szBuf)); 
  +            TextOut(lpdis->hDC, XBITMAP + 6, y, szBuf, (int)strlen(szBuf)); 
               break; 
   
           case ODA_FOCUS: 
  
  
  

Mime
View raw message