Fix incorrect/inconsistant/duplicate header file defines

Standardise to platform_filename_h Signed-off-by: Paul Jones <[email protected]>
openpnp · Oct 16, 2017 · 2d0d46f · 2d0d46f
1 parent 5d826b0
commit 2d0d46f
Show file tree

Hide file tree

Showing 15 changed files with 30 additions and 30 deletions.
diff --git a/linux/mjpeghelper.h b/linux/mjpeghelper.h
@@ -9,8 +9,8 @@
 
 */
 
-#ifndef mjpeghelper_h
-#define mjpeghelper_h
+#ifndef linux_mjpeghelper_h
+#define linux_mjpeghelper_h
 
 #include <turbojpeg.h>
 #include <stdint.h>

diff --git a/linux/platformcontext.h b/linux/platformcontext.h
@@ -10,8 +10,8 @@
 
 */
 
-#ifndef openpnp_win32platformcontext_h
-#define openpnp_win32platformcontext_h
+#ifndef linux_platformcontext_h
+#define linux_platformcontext_h
 
 #define _CRT_SECURE_NO_WARNINGS
 

diff --git a/linux/platformdeviceinfo.h b/linux/platformdeviceinfo.h
@@ -1,5 +1,5 @@
-#ifndef platformdeviceinfo_h
-#define platformdeviceinfo_h
+#ifndef linux_platformdeviceinfo_h
+#define linux_platformdeviceinfo_h
 
 #include <linux/videodev2.h>
 #include <string>

diff --git a/linux/platformstream.h b/linux/platformstream.h
@@ -11,8 +11,8 @@
 
 */
 
-#ifndef win32platform_stream_h
-#define win32platform_stream_h
+#ifndef linux_platformstream_h
+#define linux_platformstream_h
 
 #include <stdint.h>
 #include <vector>

diff --git a/linux/scopedptr.h b/linux/scopedptr.h
@@ -7,8 +7,8 @@
 
 */
 
-#ifndef scopedptr_h
-#define scopedptr_h
+#ifndef linux_scopedptr_h
+#define linux_scopedptr_h
 
 /** The ScopedPtr takes a pointer to a generic object and will 
  delete/destroy the object when the owning ScopedComPtr is 

diff --git a/linux/yuvconverters.h b/linux/yuvconverters.h
@@ -11,8 +11,8 @@
 
 */
 
-#ifndef yuvconverters_h
-#define yuvconverters_h
+#ifndef linux_yuvconverters_h
+#define linux_yuvconverters_h
 
 #include <stdint.h>
 

diff --git a/mac/platformcontext.h b/mac/platformcontext.h
@@ -1,5 +1,5 @@
-#ifndef openpnp_macplatformcontext_h
-#define openpnp_macplatformcontext_h
+#ifndef mac_platformcontext_h
+#define mac_platformcontext_h
 
 #include "openpnp-capture.h"
 

diff --git a/mac/platformdeviceinfo.h b/mac/platformdeviceinfo.h
@@ -9,8 +9,8 @@
 
 */
 
-#ifndef platformdeviceinfo_h
-#define platformdeviceinfo_h
+#ifndef mac_platformdeviceinfo_h
+#define mac_platformdeviceinfo_h
 
 #include <string>
 #include <vector>

diff --git a/mac/platformstream.h b/mac/platformstream.h
@@ -11,8 +11,8 @@
 
 */
 
-#ifndef macplatform_stream_h
-#define macplatform_stream_h
+#ifndef mac_platformstream_h
+#define mac_platformstream_h
 
 #include <stdint.h>
 #include "../common/logging.h"

diff --git a/mac/uvcctrl.h b/mac/uvcctrl.h
@@ -11,8 +11,8 @@
 
 */
 
-#ifndef uvcctrl_h
-#define uvcctrl_h
+#ifndef mac_uvcctrl_h
+#define mac_uvcctrl_h
 
 #import <CoreFoundation/CoreFoundation.h>
 

diff --git a/win/platformcontext.h b/win/platformcontext.h
@@ -10,8 +10,8 @@
 
 */
 
-#ifndef openpnp_win32platformcontext_h
-#define openpnp_win32platformcontext_h
+#ifndef win_platformcontext_h
+#define win_platformcontext_h
 
 #include <vector>
 #include <string>

diff --git a/win/platformdeviceinfo.h b/win/platformdeviceinfo.h
@@ -1,5 +1,5 @@
-#ifndef platformdeviceinfo_h
-#define platformdeviceinfo_h
+#ifndef win_platformdeviceinfo_h
+#define win_platformdeviceinfo_h
 
 #include <windows.h>
 #include <Dshow.h>

diff --git a/win/platformstream.h b/win/platformstream.h
@@ -11,8 +11,8 @@
 
 */
 
-#ifndef win32platform_stream_h
-#define win32platform_stream_h
+#ifndef win_platformstream_h
+#define win_platformstream_h
 
 #include <windows.h>
 #include <dshow.h>

diff --git a/win/samplegrabber.h b/win/samplegrabber.h
@@ -1,7 +1,7 @@
 ///////////////////////////////////////////////////////////////////////////////////
 
-#ifndef __qedit_h__
-#define __qedit_h__
+#ifndef win_samplegrabber_h
+#define win_samplegrabber_h
 
 ///////////////////////////////////////////////////////////////////////////////////
 

diff --git a/win/scopedcomptr.h b/win/scopedcomptr.h
@@ -7,8 +7,8 @@
 
 */
 
-#ifndef scopedcomptr_h
-#define scopedcomptr_h
+#ifndef win_scopedcomptr_h
+#define win_scopedcomptr_h
 
 /** The ScopedComPtr takes a pointer to a generic COM
  interface object and will release the object when