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
This commit is contained in:
@@ -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");
|
||||
wxASSERT(pIterator != NULL);
|
||||
wxASSERT(pIterator != 0);
|
||||
|
||||
//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);
|
||||
|
@@ -71,7 +71,7 @@ int wxAddProcessCallbackForPid(wxEndProcessData *proc_data, int pid)
|
||||
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;
|
||||
|
Reference in New Issue
Block a user