commit a831f2a1e78da129c286e0c2477823ef9a2c3364
author Patrik Stridvall <ps@leissner.se> Sun Jun 11 20:03:17 2000 +0000
committer Alexandre Julliard <julliard@winehq.org> Sun Jun 11 20:03:17 2000 +0000
tree f05b9b04e27067a0aa8a3b148057c804970eeada
parent ae8760201c8c4268d915af4eeefe73a51b0d476b

Fixed some warnings.

dlls/comctl32/toolbar.c

diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c
index 78502ff..dd5eb45 100644
--- a/dlls/comctl32/toolbar.c
+++ b/dlls/comctl32/toolbar.c
@@ -1153,7 +1153,7 @@
 
        if (infoPtr->nNumBitmaps + nButtons != imagecount)
        {
-         WARN("Desired images do not match recieved images : Previous image number %s Previous images in list %i  added %i expecting total %i, Images in list %i\n",
+         WARN("Desired images do not match recieved images : Previous image number %i Previous images in list %i  added %i expecting total %i, Images in list %i\n",
 	      infoPtr->nNumBitmaps, nCount, imagecount - nCount,
 	      infoPtr->nNumBitmaps+nButtons,imagecount);
 

dlls/shell32/shellpath.c

diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c
index d389ce3..a3e01a1 100644
--- a/dlls/shell32/shellpath.c
+++ b/dlls/shell32/shellpath.c
@@ -2185,9 +2185,9 @@
 	while( *pszPath )
 	{
 	  if(*pszPath++=='\\')
-	    return pszPath;
+	    return (LPSTR) pszPath;
 	}
-	return pszPath;
+	return (LPSTR) pszPath;
 }
 
 /*************************************************************************
@@ -2198,9 +2198,9 @@
 	while( *pszPath )
 	{
 	  if(*pszPath++=='\\')
-	    return pszPath;
+	    return (LPWSTR) pszPath;
 	}
-	return pszPath;
+	return (LPWSTR) pszPath;
 }
 
 /*************************************************************************

tools/build.c

diff --git a/tools/build.c b/tools/build.c
index abbfb51..b8f8b4d 100644
--- a/tools/build.c
+++ b/tools/build.c
@@ -1252,8 +1252,8 @@
 
     fprintf( outfile, "extern char pe_header[];\n" );
     fprintf( outfile, "asm(\".section .text\\n\\t\"\n" );
-    fprintf( outfile, "    \".align %d\\n\"\n", page_size );
-    fprintf( outfile, "    \"pe_header:\\t.fill %d,1,0\\n\\t\");\n", page_size );
+    fprintf( outfile, "    \".align %ld\\n\"\n", page_size );
+    fprintf( outfile, "    \"pe_header:\\t.fill %ld,1,0\\n\\t\");\n", page_size );
 
     fprintf( outfile, "static const char dllname[] = \"%s\";\n", DLLName );