From 4abcf93fc2f7e61208eaca60cc14852bc2c090e1 Mon Sep 17 00:00:00 2001 From: "Allan K. Edwards" Date: Wed, 6 Oct 2004 13:33:29 +0000 Subject: [PATCH] WIN64: fix some windows specific 64bit warnings git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105390 13f79535-47bb-0310-9956-ffa450edef68 --- modules/arch/win32/mod_win32.c | 2 +- server/mpm/winnt/service.c | 4 ++-- support/win32/ApacheMonitor.c | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/arch/win32/mod_win32.c b/modules/arch/win32/mod_win32.c index b7edf65bfb..3ced4519d4 100644 --- a/modules/arch/win32/mod_win32.c +++ b/modules/arch/win32/mod_win32.c @@ -108,7 +108,7 @@ static void prep_string(const char ** str, apr_pool_t *p) { const char *ch = *str; char *ch2; - int widen = 0; + apr_size_t widen = 0; if (!ch) { return; diff --git a/server/mpm/winnt/service.c b/server/mpm/winnt/service.c index dc81c2a55a..e1db466bbe 100644 --- a/server/mpm/winnt/service.c +++ b/server/mpm/winnt/service.c @@ -134,7 +134,7 @@ void hold_console_open_on_error(void) 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 @@ void hold_console_open_on_error(void) 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; } diff --git a/support/win32/ApacheMonitor.c b/support/win32/ApacheMonitor.c index edf1f39579..1c4120b537 100644 --- a/support/win32/ApacheMonitor.c +++ b/support/win32/ApacheMonitor.c @@ -492,7 +492,7 @@ BOOL CenterWindow(HWND hwndChild) 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 @@ BOOL ApacheManageService(LPCSTR szServiceName, LPCSTR szImagePath, 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 @@ LRESULT CALLBACK ServiceDlgProc(HWND hDlg, UINT message, int i, y; HDC hdcMem; RECT rcBitmap; - UINT nItem; + LRESULT nItem; LPMEASUREITEMSTRUCT lpmis; LPDRAWITEMSTRUCT lpdis; @@ -1324,7 +1324,7 @@ LRESULT CALLBACK ServiceDlgProc(HWND hDlg, UINT message, 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: -- 2.50.1