Fix header guards to be compliant with C standard

OpenNI · Nov 12, 2013 · 69dff6e · 69dff6e
1 parent 53dc98d
commit 69dff6e
Show file tree

Hide file tree

Showing 258 changed files with 799 additions and 736 deletions.
diff --git a/Include/Android-Arm/OniPlatformAndroid-Arm.h b/Include/Android-Arm/OniPlatformAndroid-Arm.h
@@ -18,8 +18,8 @@
 *  limitations under the License.                                            *
 *                                                                            *
 *****************************************************************************/
-#ifndef _ONI_PLATFORM_ANDROID_ARM_H_
-#define _ONI_PLATFORM_ANDROID_ARM_H_
+#ifndef ONIPLATFORMANDROID_ARM_H
+#define ONIPLATFORMANDROID_ARM_H
 
 // Start with Linux-x86, and override what's different
 #include "../Linux-x86/OniPlatformLinux-x86.h"
@@ -40,4 +40,4 @@
 	#define ONI_PLATFORM_STRING "AndroidOS-Arm"
 #endif
 
-#endif //_ONI_PLATFORM_LINUX_ARM_H_
+#endif // ONIPLATFORMANDROID_ARM_H
diff --git a/Include/Driver/OniDriverAPI.h b/Include/Driver/OniDriverAPI.h
@@ -18,8 +18,8 @@
 *  limitations under the License.                                            *
 *                                                                            *
 *****************************************************************************/
-#ifndef _ONI_DRIVER_API_H_
-#define _ONI_DRIVER_API_H_
+#ifndef ONIDRIVERAPI_H
+#define ONIDRIVERAPI_H
 
 #include "OniPlatform.h"
 #include "OniCTypes.h"
@@ -375,4 +375,4 @@ ONI_C_API_EXPORT void oniDriverDisableFrameSync(void* frameSyncGroup)
 	return g_pDriver->disableFrameSync(frameSyncGroup);																		\
 }																															\
 
-#endif // _ONI_DRIVER_API_H_
+#endif // ONIDRIVERAPI_H
diff --git a/Include/Driver/OniDriverTypes.h b/Include/Driver/OniDriverTypes.h
@@ -18,8 +18,8 @@
 *  limitations under the License.                                            *
 *                                                                            *
 *****************************************************************************/
-#ifndef _ONI_DRIVER_TYPES_H_
-#define _ONI_DRIVER_TYPES_H_
+#ifndef ONIDRIVERTYPES_H
+#define ONIDRIVERTYPES_H
 
 #include <OniCTypes.h>
 #include <stdarg.h>
@@ -51,4 +51,4 @@ struct OniStreamServices
 };
 
 
-#endif // _ONI_DRIVER_TYPES_H_
+#endif // ONIDRIVERTYPES_H
diff --git a/Include/KinectProperties.h b/Include/KinectProperties.h
@@ -18,8 +18,8 @@
 *  limitations under the License.                                            *
 *                                                                            *
 *****************************************************************************/
-#ifndef _KINECT_PROPERTIES_H_
-#define _KINECT_PROPERTIES_H_
+#ifndef KINECTPROPERTIES_H
+#define KINECTPROPERTIES_H
 
 #include <OniCTypes.h>
 
@@ -101,4 +101,4 @@ typedef struct
 	float z;
 } KinectVector3f;
 
-#endif // _KINECT_PROPERTIES_H_
+#endif // KINECTPROPERTIES_H
diff --git a/Include/Linux-Arm/OniPlatformLinux-Arm.h b/Include/Linux-Arm/OniPlatformLinux-Arm.h
@@ -18,8 +18,8 @@
 *  limitations under the License.                                            *
 *                                                                            *
 *****************************************************************************/
-#ifndef _ONI_PLATFORM_LINUX_ARM_H_
-#define _ONI_PLATFORM_LINUX_ARM_H_
+#ifndef ONIPLATFORMLINUX_ARM_H
+#define ONIPLATFORMLINUX_ARM_H
 
 // Start with Linux-x86, and override what's different
 #include "../Linux-x86/OniPlatformLinux-x86.h"
@@ -32,5 +32,5 @@
 #define ONI_PLATFORM ONI_PLATFORM_LINUX_ARM
 #define ONI_PLATFORM_STRING "Linux-Arm"
 
-#endif //_ONI_PLATFORM_LINUX_ARM_H_
+#endif // ONIPLATFORMLINUX_ARM_H
 
diff --git a/Include/Linux-x86/OniPlatformLinux-x86.h b/Include/Linux-x86/OniPlatformLinux-x86.h
@@ -18,8 +18,8 @@
 *  limitations under the License.                                            *
 *                                                                            *
 *****************************************************************************/
-#ifndef _ONI_PLATFORM_LINUX_X86_H_
-#define _ONI_PLATFORM_LINUX_X86_H_
+#ifndef ONIPLATFORMLINUX_X86_H
+#define ONIPLATFORMLINUX_X86_H
 
 //---------------------------------------------------------------------------
 // Prerequisites
@@ -98,5 +98,5 @@
 /** Indicates a deprecated function */
 #define ONI_API_DEPRECATED(msg) __attribute__((warning("This function is deprecated: " msg)))
 
-#endif //_ONI_PLATFORM_LINUX_X86_H_
+#endif // ONIPLATFORMLINUX_X86_H
 
diff --git a/Include/MacOSX/OniPlatformMacOSX.h b/Include/MacOSX/OniPlatformMacOSX.h
@@ -18,8 +18,8 @@
 *  limitations under the License.                                            *
 *                                                                            *
 *****************************************************************************/
-#ifndef _ONI_PLATFORM_MACOSX_H_
-#define _ONI_PLATFORM_MACOSX_H_
+#ifndef ONIPLATFORMMACOSX_H
+#define ONIPLATFORMMACOSX_H
 
 // Start with Linux-x86, and override what's different
 #include "../Linux-x86/OniPlatformLinux-x86.h"
@@ -54,4 +54,4 @@
 #undef ONI_THREAD_STATIC
 #define ONI_THREAD_STATIC 
 
-#endif //_ONI_PLATFORM_MACOSX_H_
+#endif // ONIPLATFORMMACOSX_H
diff --git a/Include/OniCAPI.h b/Include/OniCAPI.h
@@ -18,8 +18,8 @@
 *  limitations under the License.                                            *
 *                                                                            *
 *****************************************************************************/
-#ifndef _ONI_C_API_H_
-#define _ONI_C_API_H_
+#ifndef ONICAPI_H
+#define ONICAPI_H
 
 #include "OniPlatform.h"
 #include "OniCTypes.h"
@@ -256,4 +256,4 @@ ONI_C_API OniStatus oniSetLogFileOutput(OniBool bFileOutput);
  */
 ONI_C_API OniStatus oniSetLogAndroidOutput(OniBool bAndroidOutput);
 #endif
-#endif // _ONI_C_API_H_
+#endif // ONICAPI_H
diff --git a/Include/OniCEnums.h b/Include/OniCEnums.h
@@ -18,8 +18,8 @@
 *  limitations under the License.                                            *
 *                                                                            *
 *****************************************************************************/
-#ifndef _ONI_C_ENUMS_H_
-#define _ONI_C_ENUMS_H_
+#ifndef ONICENUMS_H
+#define ONICENUMS_H
 
 /** Possible failure values */
 typedef enum
@@ -81,4 +81,4 @@ enum
 	ONI_TIMEOUT_FOREVER = -1,
 };
 
-#endif // _ONI_C_ENUMS_H_
+#endif // ONICENUMS_H
diff --git a/Include/OniCProperties.h b/Include/OniCProperties.h
@@ -18,8 +18,8 @@
 *  limitations under the License.                                            *
 *                                                                            *
 *****************************************************************************/
-#ifndef _ONI_C_PROPERTIES_H_
-#define _ONI_C_PROPERTIES_H_
+#ifndef ONICPROPERTIES_H
+#define ONICPROPERTIES_H
 
 // Device properties
 enum
@@ -65,4 +65,4 @@ enum
 	ONI_DEVICE_COMMAND_SEEK				= 1, // OniSeek
 };
 
-#endif // _ONI_C_PROPERTIES_H_
+#endif // ONICPROPERTIES_H
diff --git a/Include/OniCTypes.h b/Include/OniCTypes.h
@@ -18,8 +18,8 @@
 *  limitations under the License.                                            *
 *                                                                            *
 *****************************************************************************/
-#ifndef _ONI_TYPES_H_
-#define _ONI_TYPES_H_
+#ifndef ONICTYPES_H
+#define ONICTYPES_H
 
 #include "OniPlatform.h"
 #include "OniCEnums.h"
@@ -208,4 +208,4 @@ typedef struct
 	OniStreamHandle stream;
 } OniSeek;
 
-#endif // _ONI_TYPES_H_
+#endif // ONICTYPES_H
diff --git a/Include/OniEnums.h b/Include/OniEnums.h
@@ -18,8 +18,8 @@
 *  limitations under the License.                                            *
 *                                                                            *
 *****************************************************************************/
-#ifndef _ONI_ENUMS_H_
-#define _ONI_ENUMS_H_
+#ifndef ONIENUMS_H
+#define ONIENUMS_H
 
 namespace openni
 {
@@ -83,4 +83,4 @@ static const int TIMEOUT_FOREVER = -1;
 
 } // namespace openni
 
-#endif // _ONI_ENUMS_H_
+#endif // ONIENUMS_H
diff --git a/Include/OniPlatform.h b/Include/OniPlatform.h
@@ -18,8 +18,8 @@
 *  limitations under the License.                                            *
 *                                                                            *
 *****************************************************************************/
-#ifndef _ONI_PLATFORM_H_
-#define _ONI_PLATFORM_H_
+#ifndef ONIPLATFORM_H
+#define ONIPLATFORM_H
 
 // Supported platforms
 #define ONI_PLATFORM_WIN32 1
@@ -69,4 +69,4 @@
 #endif // OPENNI2_EXPORT
 
 
-#endif // _ONI_PLATFORM_H_
+#endif // ONIPLATFORM_H
diff --git a/Include/OniProperties.h b/Include/OniProperties.h
@@ -18,8 +18,8 @@
 *  limitations under the License.                                            *
 *                                                                            *
 *****************************************************************************/
-#ifndef _ONI_PROPERTIES_H_
-#define _ONI_PROPERTIES_H_
+#ifndef ONIPROPERTIES_H
+#define ONIPROPERTIES_H
 
 namespace openni
 {
@@ -70,4 +70,4 @@ enum
 };
 
 } // namespace openni
-#endif // _ONI_PROPERTIES_H_
+#endif // ONIPROPERTIES_H
diff --git a/Include/OniTest.h b/Include/OniTest.h
@@ -18,8 +18,8 @@
 *  limitations under the License.                                            *
 *                                                                            *
 *****************************************************************************/
-#ifndef _ONI_TEST_H_
-#define _ONI_TEST_H_
+#ifndef ONITEST_H
+#define ONITEST_H
 
 #define TEST_DEVICE_NAME "Test" // use with device.open() to create a test device
 
@@ -37,4 +37,4 @@ typedef struct TestCommandIssueFrame
 	void* data;
 } TestCommandIssueFrame;
 
-#endif //_ONI_TEST_H_
+#endif // ONITEST_H
diff --git a/Include/OniVersion.h b/Include/OniVersion.h
@@ -18,6 +18,9 @@
 *  limitations under the License.                                            *
 *                                                                            *
 *****************************************************************************/
+#ifndef ONIVERSION_H
+#define ONIVERSION_H
+
 #include "OniPlatform.h"
 
 #define ONI_VERSION_MAJOR	2
@@ -41,3 +44,5 @@
 #define ONI_VERSION_STRING \
 	ONI_BRIEF_VERSION_STRING  "-" \
 	ONI_PLATFORM_STRING " (" ONI_TIMESTAMP ")"
+
+#endif // ONIVERSION_H
diff --git a/Include/OpenNI.h b/Include/OpenNI.h
@@ -18,8 +18,8 @@
 *  limitations under the License.                                            *
 *                                                                            *
 *****************************************************************************/
-#ifndef _OPENNI_H_
-#define _OPENNI_H_
+#ifndef OPENNI_H
+#define OPENNI_H
 
 #include "OniPlatform.h"
 #include "OniProperties.h"
@@ -2762,4 +2762,4 @@ void Device::close()
 
 }
 
-#endif // _OPEN_NI_HPP_
+#endif // OPENNI_H
diff --git a/Include/PS1080.h b/Include/PS1080.h
@@ -18,8 +18,8 @@
 *  limitations under the License.                                            *
 *                                                                            *
 *****************************************************************************/
-#ifndef _PS1080_H_
-#define _PS1080_H_
+#ifndef PS1080_H
+#define PS1080_H
 
 #include <OniCTypes.h>
 
@@ -635,4 +635,4 @@ typedef struct XnBist
 
 #pragma pack (pop)
 
-#endif //_PS1080_H_
+#endif // PS1080_H
diff --git a/Include/PSLink.h b/Include/PSLink.h
@@ -18,8 +18,8 @@
 *  limitations under the License.                                            *
 *                                                                            *
 *****************************************************************************/
-#ifndef __XN_PRIME_CLIENT_PROPS_H__
-#define __XN_PRIME_CLIENT_PROPS_H__
+#ifndef PSLINK_H
+#define PSLINK_H
 
 #include <PrimeSense.h>
 
@@ -236,4 +236,4 @@ typedef struct XnCommandSetProjectorPulse
 
 #pragma pack (pop)
 
-#endif //__XN_PRIME_CLIENT_PROPS_H__
+#endif // PSLINK_H
diff --git a/Include/PrimeSense.h b/Include/PrimeSense.h
@@ -18,8 +18,8 @@
 *  limitations under the License.                                            *
 *                                                                            *
 *****************************************************************************/
-#ifndef _PRIME_SENSE_H_
-#define _PRIME_SENSE_H_
+#ifndef PRIMESENSE_H
+#define PRIMESENSE_H
 
 #include <OniCTypes.h>
 
@@ -257,4 +257,4 @@ typedef struct XnCommandDebugData
 
 #pragma pack (pop)
 
-#endif //_PRIME_SENSE_H_
+#endif // PRIMESENSE_H
diff --git a/Include/Win32/OniPlatformWin32.h b/Include/Win32/OniPlatformWin32.h
@@ -18,8 +18,8 @@
 *  limitations under the License.                                            *
 *                                                                            *
 *****************************************************************************/
-#ifndef _ONI_PLATFORM_WIN32_H_
-#define _ONI_PLATFORM_WIN32_H_
+#ifndef ONIPLATFORMWIN32_H
+#define ONIPLATFORMWIN32_H
 
 //---------------------------------------------------------------------------
 // Prerequisites
@@ -136,4 +136,4 @@ typedef unsigned __int64 uint64_t;
 	#define ONI_API_DEPRECATED(msg) __declspec(deprecated(msg))
 #endif
 
-#endif //_ONI_PLATFORM_WIN32_H_
+#endif // ONIPLATFORMWIN32_H
diff --git a/Samples/ClosestPointViewer/Viewer.h b/Samples/ClosestPointViewer/Viewer.h
@@ -18,8 +18,8 @@
 *  limitations under the License.                                            *
 *                                                                            *
 *****************************************************************************/
-#ifndef _ONI_SAMPLE_VIEWER_H_
-#define _ONI_SAMPLE_VIEWER_H_
+#ifndef VIEWER_H
+#define VIEWER_H
 
 #include "MWClosestPoint/MWClosestPoint.h"
 #include <OpenNI.h>
@@ -98,4 +98,4 @@ class SampleViewer
 };
 
 
-#endif // _ONI_SAMPLE_VIEWER_H_
+#endif // VIEWER_H
diff --git a/Samples/Common/OniSampleUtilities.h b/Samples/Common/OniSampleUtilities.h
@@ -18,8 +18,8 @@
 *  limitations under the License.                                            *
 *                                                                            *
 *****************************************************************************/
-#ifndef _ONI_SAMPLE_UTILITIES_H_
-#define _ONI_SAMPLE_UTILITIES_H_
+#ifndef ONISAMPLEUTILITIES_H
+#define ONISAMPLEUTILITIES_H
 
 #include <stdio.h>
 #include <OpenNI.h>
@@ -116,4 +116,4 @@ void calculateHistogram(float* pHistogram, int histogramSize, const openni::Vide
 
 
 
-#endif // _ONI_SAMPLE_UTILITIES_H_
+#endif // ONISAMPLEUTILITIES_H