fixing NULL vs 0 warnings in gcc 4

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31793 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/mac/carbon/hid.cpp b/src/mac/carbon/hid.cpp
index 3d17c726bdb5aa4d427615c67d5b250104852948..3dec1a481e93d09f2ef15ab053d3f975433b22f9 100644 (file)
--- a/src/mac/carbon/hid.cpp
+++ b/src/mac/carbon/hid.cpp
@@ -118,11 +118,11 @@ bool wxHIDDevice::Create (const int& nClass, const int& nType)
        //Now get the maching services
        io_iterator_t pIterator;
        wxIOCHECK(IOServiceGetMatchingServices(m_pPort, pDictionary, &pIterator), "No Matching HID Services");
        //Now get the maching services
        io_iterator_t pIterator;
        wxIOCHECK(IOServiceGetMatchingServices(m_pPort, pDictionary, &pIterator), "No Matching HID Services");

-       wxASSERT(pIterator != NULL);
+       wxASSERT(pIterator != 0);

 
        //Now we iterate through them
        io_object_t pObject;
 
        //Now we iterate through them
        io_object_t pObject;

-       while ( (pObject = IOIteratorNext(pIterator)) != NULL)
+       while ( (pObject = IOIteratorNext(pIterator)) != 0)

        {
                wxVERIFY(IORegistryEntryCreateCFProperties(pObject, &pDictionary,
                                                                                        kCFAllocatorDefault, kNilOptions) == KERN_SUCCESS);
        {
                wxVERIFY(IORegistryEntryCreateCFProperties(pObject, &pDictionary,
                                                                                        kCFAllocatorDefault, kNilOptions) == KERN_SUCCESS);

diff --git a/src/mac/corefoundation/utilsexc_cf.cpp b/src/mac/corefoundation/utilsexc_cf.cpp
index a3f55509be1dde3fc16858684ce59d9e9af47283..77c5ddbcc61cb298ccb5cafcd6ff1a42d13f4899 100644 (file)
--- a/src/mac/corefoundation/utilsexc_cf.cpp
+++ b/src/mac/corefoundation/utilsexc_cf.cpp
@@ -71,7 +71,7 @@ int wxAddProcessCallbackForPid(wxEndProcessData *proc_data, int pid)
         return -1;
     }
     CFMachPortContext termcb_contextinfo;
         return -1;
     }
     CFMachPortContext termcb_contextinfo;

-    termcb_contextinfo.version = NULL;
+    termcb_contextinfo.version = 0;

     termcb_contextinfo.info = (void*)proc_data;
     termcb_contextinfo.retain = NULL;
     termcb_contextinfo.release = NULL;
     termcb_contextinfo.info = (void*)proc_data;
     termcb_contextinfo.retain = NULL;
     termcb_contextinfo.release = NULL;