Changeset 39206 in vbox for trunk/include/VBox

Timestamp:

Nov 4, 2011 3:16:16 PM (14 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

74719

Message:

Made OpenGL build against the Mac OS X 10.7 SDK. Some cleanups.

File:

• trunk/include/VBox/VBoxCocoa.h (modified) (4 diffs)

trunk/include/VBox/VBoxCocoa.h

@@ -1 +1 @@
 /** @file
- *
  * VBoxCocoa Helper
  */
 
 /*
- * Copyright (C) 2009-2010 Oracle Corporation
+ * Copyright (C) 2009-2011 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -25 +24 @@
  */
 
-#ifndef __VBoxCocoa_h__
-#define __VBoxCocoa_h__
+#ifndef ___VBox_VBoxCocoa_h
+#define ___VBox_VBoxCocoa_h
 
-/* Macro which add a typedef of the given Cocoa class in an appropriate form
+/** Macro which add a typedef of the given Cocoa class in an appropriate form
  * for the current context. This means void* in the C/CPP context and
  * NSWhatever* in the ObjC/ObjCPP context. Use
@@ -35 +34 @@
  * right type in the Cocoa context. */
 #ifdef __OBJC__
-#define ADD_COCOA_NATIVE_REF(CocoaClass) \
-@class CocoaClass; \
-typedef CocoaClass *Native##CocoaClass##Ref; \
-typedef const CocoaClass *ConstNative##CocoaClass##Ref
-#else /* __OBJC__ */
-#define ADD_COCOA_NATIVE_REF(CocoaClass) \
-typedef void *Native##CocoaClass##Ref; \
-typedef const void *ConstNative##CocoaClass##Ref
-#endif /* __OBJC__ */
+# define ADD_COCOA_NATIVE_REF(CocoaClass) \
+    @class CocoaClass; \
+    typedef CocoaClass *Native##CocoaClass##Ref; \
+    typedef const CocoaClass *ConstNative##CocoaClass##Ref
+#else  /* !__OBJC__ */
+# define ADD_COCOA_NATIVE_REF(CocoaClass) \
+    typedef void *Native##CocoaClass##Ref; \
+    typedef const void *ConstNative##CocoaClass##Ref
+#endif /* !__OBJC__ */
 
-/* Check for OBJC++ */
+
+/*
+ * Objective-C++ Helpers.
+ */
 #if defined(__OBJC__) && defined (__cplusplus)
 
 /* Global includes */
-#import <Foundation/NSAutoreleasePool.h>
+# import <Foundation/NSAutoreleasePool.h>
 
-/* Helper class for automatic creation & destroying of a cocoa auto release
-   pool. */
+/** Helper class for automatic creation & destroying of a cocoa auto release
+ *  pool. */
 class CocoaAutoreleasePool
 {
@@ -69 +71 @@
 };
 
-#endif /* __OBJC__ */
+#endif /* __OBJC__ && __cplusplus */
 
-#endif /* __VBoxCocoa_h__ */
+#endif /* !___VBox_VBoxCocoa_h */