From b409fa19591179c71e10c6d3c88814f2d96f3af9 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Sun, 6 Feb 2005 15:59:08 +0000 Subject: [PATCH] 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 --- src/mac/carbon/hid.cpp | 4 ++-- src/mac/corefoundation/utilsexc_cf.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/mac/carbon/hid.cpp b/src/mac/carbon/hid.cpp index 3d17c726bd..3dec1a481e 100644 --- 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"); - 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); diff --git a/src/mac/corefoundation/utilsexc_cf.cpp b/src/mac/corefoundation/utilsexc_cf.cpp index a3f55509be..77c5ddbcc6 100644 --- 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; - termcb_contextinfo.version = NULL; + termcb_contextinfo.version = 0; termcb_contextinfo.info = (void*)proc_data; termcb_contextinfo.retain = NULL; termcb_contextinfo.release = NULL; -- 2.47.2