Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixing NULL vs 0 warnings in gcc 4

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31793 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2005-02-06 15:59:08 +00:00
parent 819f6fb9f0
commit b409fa1959
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/mac/carbon/hid.cpp
View File

@@ -118,11 +118,11 @@ bool wxHIDDevice::Create (const int& nClass, const int& nType)
//Now get the maching services //Now get the maching services
io_iterator_t pIterator; io_iterator_t pIterator;
wxIOCHECK(IOServiceGetMatchingServices(m_pPort, pDictionary, &pIterator), "No Matching HID Services"); wxIOCHECK(IOServiceGetMatchingServices(m_pPort, pDictionary, &pIterator), "No Matching HID Services");
wxASSERT(pIterator != NULL); wxASSERT(pIterator != 0);
//Now we iterate through them //Now we iterate through them
io_object_t pObject; io_object_t pObject;
while ( (pObject = IOIteratorNext(pIterator)) != NULL) while ( (pObject = IOIteratorNext(pIterator)) != 0)
{ {
wxVERIFY(IORegistryEntryCreateCFProperties(pObject, &pDictionary, wxVERIFY(IORegistryEntryCreateCFProperties(pObject, &pDictionary,
kCFAllocatorDefault, kNilOptions) == KERN_SUCCESS); kCFAllocatorDefault, kNilOptions) == KERN_SUCCESS);

2
src/mac/corefoundation/utilsexc_cf.cpp
View File

@@ -71,7 +71,7 @@ int wxAddProcessCallbackForPid(wxEndProcessData *proc_data, int pid)
return -1; return -1;
} }
CFMachPortContext termcb_contextinfo; CFMachPortContext termcb_contextinfo;
termcb_contextinfo.version = NULL; termcb_contextinfo.version = 0;
termcb_contextinfo.info = (void*)proc_data; termcb_contextinfo.info = (void*)proc_data;
termcb_contextinfo.retain = NULL; termcb_contextinfo.retain = NULL;
termcb_contextinfo.release = NULL; termcb_contextinfo.release = NULL;