X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7cfdeaadb8070f806cfdfa6c9021c71f3391b742..644231539d2ccf9ef873060154079f33ba7a42db:/src/msw/volume.cpp?ds=sidebyside

diff --git a/src/msw/volume.cpp b/src/msw/volume.cpp
index ac38c7d4ab..5a3ad4e440 100644
--- a/src/msw/volume.cpp
+++ b/src/msw/volume.cpp
@@ -109,7 +109,8 @@ static FileInfoMap s_fileInfo(25);
 // Other initialization.
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 #if wxUSE_GUI
-WX_DEFINE_OBJARRAY(wxIconArray);
+// already in wx/iconbndl.h
+// WX_DEFINE_OBJARRAY(wxIconArray);
 #endif
 
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -255,8 +256,8 @@ static void BuildListFromNN(wxArrayString& list, NETRESOURCE* pResSrc,
     //----------------------------------------------------------------------
     if (rc = s_pWNetOpenEnum(scope, RESOURCETYPE_DISK, 0, pResSrc, &hEnum), rc == NO_ERROR)
     {
-        unsigned long count = 1;
-        unsigned long size = 256;
+        DWORD count = 1;
+        DWORD size = 256;
         NETRESOURCE* pRes = (NETRESOURCE*)malloc(size);
         memset(pRes, 0, sizeof(NETRESOURCE));
         while (rc = s_pWNetEnumResource(hEnum, &count, pRes, &size), rc == NO_ERROR || rc == ERROR_MORE_DATA)