Fixed more warnings in VC2010 32+64 bits builds

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@9395 ea41ed52-d2ee-0310-a9c1-e6b18d33e121

4 files changed, 8 insertions, 8 deletions

diff --git a/FL/Fl_Native_File_Chooser.H b/FL/Fl_Native_File_Chooser.H
index 1c7a8e82c..9b7f2fdf0 100644
--- a/FL/Fl_Native_File_Chooser.H
+++ b/FL/Fl_Native_File_Chooser.H
@@ -164,7 +164,7 @@ private:
   void set_single_pathname(const char *s);
   void add_pathname(const char *s);
   
-  void FreePIDL(ITEMIDLIST *pidl);
+  void FreePIDL(LPITEMIDLIST pidl);
   void ClearOFN();
   void ClearBINF();
   void Win2Unix(char *s);
diff --git a/jpeg/jdatadst.c b/jpeg/jdatadst.c
index 472d5f324..e58fe6616 100644
--- a/jpeg/jdatadst.c
+++ b/jpeg/jdatadst.c
@@ -182,7 +182,7 @@ term_mem_destination (j_compress_ptr cinfo)
   my_mem_dest_ptr dest = (my_mem_dest_ptr) cinfo->dest;
 
   *dest->outbuffer = dest->buffer;
-  *dest->outsize = dest->bufsize - dest->pub.free_in_buffer;
+  *dest->outsize = (unsigned long) (dest->bufsize - dest->pub.free_in_buffer);
 }
 
 
diff --git a/jpeg/jmemmgr.c b/jpeg/jmemmgr.c
index d801b322d..78387cf9b 100644
--- a/jpeg/jmemmgr.c
+++ b/jpeg/jmemmgr.c
@@ -303,7 +303,7 @@ alloc_small (j_common_ptr cinfo, int pool_id, size_t sizeofobject)
       if (slop < MIN_SLOP)	/* give up when it gets real small */
 	out_of_memory(cinfo, 2); /* jpeg_get_small failed */
     }
-    mem->total_space_allocated += min_request + slop;
+    mem->total_space_allocated += (long) (min_request + slop);
     /* Success, initialize the new pool header and add to end of list */
     hdr_ptr->hdr.next = NULL;
     hdr_ptr->hdr.bytes_used = 0;
@@ -363,7 +363,7 @@ alloc_large (j_common_ptr cinfo, int pool_id, size_t sizeofobject)
 					    SIZEOF(large_pool_hdr));
   if (hdr_ptr == NULL)
     out_of_memory(cinfo, 4);	/* jpeg_get_large failed */
-  mem->total_space_allocated += sizeofobject + SIZEOF(large_pool_hdr);
+  mem->total_space_allocated += (long) (sizeofobject + SIZEOF(large_pool_hdr));
 
   /* Success, initialize the new pool header and add to list */
   hdr_ptr->hdr.next = mem->large_list[pool_id];
@@ -973,7 +973,7 @@ free_pool (j_common_ptr cinfo, int pool_id)
 		  lhdr_ptr->hdr.bytes_left +
 		  SIZEOF(large_pool_hdr);
     jpeg_free_large(cinfo, (void FAR *) lhdr_ptr, space_freed);
-    mem->total_space_allocated -= space_freed;
+    mem->total_space_allocated -= (long) space_freed;
     lhdr_ptr = next_lhdr_ptr;
   }
 
@@ -987,7 +987,7 @@ free_pool (j_common_ptr cinfo, int pool_id)
 		  shdr_ptr->hdr.bytes_left +
 		  SIZEOF(small_pool_hdr);
     jpeg_free_small(cinfo, (void *) shdr_ptr, space_freed);
-    mem->total_space_allocated -= space_freed;
+    mem->total_space_allocated -= (long) space_freed;
     shdr_ptr = next_shdr_ptr;
   }
 }
diff --git a/src/Fl_Native_File_Chooser_WIN32.cxx b/src/Fl_Native_File_Chooser_WIN32.cxx
index 44404ffe8..771c62aeb 100644
--- a/src/Fl_Native_File_Chooser_WIN32.cxx
+++ b/src/Fl_Native_File_Chooser_WIN32.cxx
@@ -224,7 +224,7 @@ void Fl_Native_File_Chooser::add_pathname(const char *s) {
 }
 
 // FREE A PIDL (Pointer to IDentity List)
-void Fl_Native_File_Chooser::FreePIDL(ITEMIDLIST *pidl) {
+void Fl_Native_File_Chooser::FreePIDL(LPITEMIDLIST pidl) {
   IMalloc *imalloc = NULL;
   if ( SUCCEEDED(SHGetMalloc(&imalloc)) ) {
     imalloc->Free(pidl);
@@ -516,7 +516,7 @@ int Fl_Native_File_Chooser::showdir() {
   else _binf.lParam = 0;
   _binf.lpfn = Dir_CB;
   // OPEN BROWSER
-  ITEMIDLIST *pidl = SHBrowseForFolder(&_binf);
+  LPITEMIDLIST pidl = SHBrowseForFolder(&_binf);
   // CANCEL?
   if ( pidl == NULL ) return(1);