compile fixes

[wxWidgets.git] / src / mac / carbon / hid.cpp

diff --git a/src/mac/carbon/hid.cpp b/src/mac/carbon/hid.cpp
index feb8e3a260c0ba986d423f8dc445ad1e8e0e1e96..3dec1a481e93d09f2ef15ab053d3f975433b22f9 100644 (file)
--- a/src/mac/carbon/hid.cpp
+++ b/src/mac/carbon/hid.cpp
@@ -17,7 +17,7 @@
 // headers
 // ---------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "hid.h"
 #endif
 
@@ -28,11 +28,6 @@
     #pragma hdrstop
 #endif
 
-#ifndef WX_PRECOMP
-    #include "wx/defs.h"
-#endif
-
-
 //DARWIN _ONLY_
 #ifdef __DARWIN__
 
@@ -123,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);