unify include guard defines, __$FILENAME__

without the underscores these clogged up the namespace for autocompleation which was annoying.

11 files changed, 33 insertions, 33 deletions

diff --git a/source/blender/windowmanager/WM_api.h b/source/blender/windowmanager/WM_api.h
index 132b57696e1..1be94d9c634 100644
--- a/source/blender/windowmanager/WM_api.h
+++ b/source/blender/windowmanager/WM_api.h
@@ -23,8 +23,8 @@
  *
  * ***** END GPL LICENSE BLOCK *****
  */
-#ifndef WM_API_H
-#define WM_API_H
+#ifndef __WM_API_H__
+#define __WM_API_H__
 
 /** \file WM_api.h
  *  \ingroup wm
@@ -344,5 +344,5 @@ int write_crash_blend(void);
 }
 #endif
 
-#endif /* WM_API_H */
+#endif /* __WM_API_H__ */
 
diff --git a/source/blender/windowmanager/WM_keymap.h b/source/blender/windowmanager/WM_keymap.h
index f254358e3cf..db448397065 100644
--- a/source/blender/windowmanager/WM_keymap.h
+++ b/source/blender/windowmanager/WM_keymap.h
@@ -23,8 +23,8 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-#ifndef WM_KEYMAP_H
-#define WM_KEYMAP_H
+#ifndef __WM_KEYMAP_H__
+#define __WM_KEYMAP_H__
 
 /** \file WM_keymap.h
  *  \ingroup wm
@@ -98,5 +98,5 @@ char		*WM_key_event_operator_string(const struct bContext *C, const char *opname
 }
 #endif
 
-#endif /* WM_KEYMAP_H */
+#endif /* __WM_KEYMAP_H__ */
 
diff --git a/source/blender/windowmanager/WM_types.h b/source/blender/windowmanager/WM_types.h
index 357eaf2633b..3a62faeab8a 100644
--- a/source/blender/windowmanager/WM_types.h
+++ b/source/blender/windowmanager/WM_types.h
@@ -28,8 +28,8 @@
  *  \ingroup wm
  */
 
-#ifndef WM_TYPES_H
-#define WM_TYPES_H
+#ifndef __WM_TYPES_H__
+#define __WM_TYPES_H__
 
 #ifdef __cplusplus
 extern "C" {
@@ -569,5 +569,5 @@ typedef struct RecentFile {
 }
 #endif
 
-#endif /* WM_TYPES_H */
+#endif /* __WM_TYPES_H__ */
 
diff --git a/source/blender/windowmanager/wm.h b/source/blender/windowmanager/wm.h
index d9dcb9ea10c..d1081f5450c 100644
--- a/source/blender/windowmanager/wm.h
+++ b/source/blender/windowmanager/wm.h
@@ -28,8 +28,8 @@
  *  \ingroup wm
  */
 
-#ifndef WM_H
-#define WM_H
+#ifndef __WM_H__
+#define __WM_H__
 
 struct wmWindow;
 struct ReportList;
@@ -85,5 +85,5 @@ void wm_autosave_location(char *filepath);
 extern int circle_select_size;
 #endif
 
-#endif /* WM_H */
+#endif /* __WM_H__ */
 
diff --git a/source/blender/windowmanager/wm_cursors.h b/source/blender/windowmanager/wm_cursors.h
index c179483eff3..f41b15aadcf 100644
--- a/source/blender/windowmanager/wm_cursors.h
+++ b/source/blender/windowmanager/wm_cursors.h
@@ -32,8 +32,8 @@
 
 
 
-#ifndef WM_CURSORS_H
-#define WM_CURSORS_H
+#ifndef __WM_CURSORS_H__
+#define __WM_CURSORS_H__
 
 void wm_init_cursor_data(void);
 
@@ -120,5 +120,5 @@ struct wmEvent;
 int wm_cursor_arrow_move(struct wmWindow *win, struct wmEvent *event);
 
 
-#endif /* WM_CURSORS_H */
+#endif /* __WM_CURSORS_H__ */
 
diff --git a/source/blender/windowmanager/wm_draw.h b/source/blender/windowmanager/wm_draw.h
index 9e22fc8c412..3d72fe17c79 100644
--- a/source/blender/windowmanager/wm_draw.h
+++ b/source/blender/windowmanager/wm_draw.h
@@ -29,8 +29,8 @@
  */
 
 
-#ifndef WM_DRAW_H
-#define WM_DRAW_H
+#ifndef __WM_DRAW_H__
+#define __WM_DRAW_H__
 
 struct bContext;
 struct wmWindow;
@@ -43,5 +43,5 @@ void		wm_draw_region_clear	(struct wmWindow *win, struct ARegion *ar);
 
 void		wm_tag_redraw_overlay	(struct wmWindow *win, struct ARegion *ar);
 
-#endif /* WM_DRAW_H */
+#endif /* __WM_DRAW_H__ */
 
diff --git a/source/blender/windowmanager/wm_event_system.h b/source/blender/windowmanager/wm_event_system.h
index 9c0d2ae3eff..a33d37ac50e 100644
--- a/source/blender/windowmanager/wm_event_system.h
+++ b/source/blender/windowmanager/wm_event_system.h
@@ -28,8 +28,8 @@
  *  \ingroup wm
  */
 
-#ifndef WM_EVENT_SYSTEM_H
-#define WM_EVENT_SYSTEM_H
+#ifndef __WM_EVENT_SYSTEM_H__
+#define __WM_EVENT_SYSTEM_H__
 
 /* return value of handler-operator call */
 #define WM_HANDLER_CONTINUE	0
@@ -107,5 +107,5 @@ void		wm_dropbox_free(void);
 void		wm_drags_check_ops(bContext *C, wmEvent *event);
 void		wm_drags_draw(bContext *C, wmWindow *win, rcti *rect);
 
-#endif /* WM_EVENT_SYSTEM_H */
+#endif /* __WM_EVENT_SYSTEM_H__ */
 
diff --git a/source/blender/windowmanager/wm_event_types.h b/source/blender/windowmanager/wm_event_types.h
index 47081b6a6a1..170413c13b0 100644
--- a/source/blender/windowmanager/wm_event_types.h
+++ b/source/blender/windowmanager/wm_event_types.h
@@ -35,8 +35,8 @@
  */ 
 
 
-#ifndef WM_EVENT_TYPES_H
-#define WM_EVENT_TYPES_H
+#ifndef __WM_EVENT_TYPES_H__
+#define __WM_EVENT_TYPES_H__
 
 /* customdata type */
 #define EVT_DATA_TABLET		1
@@ -365,5 +365,5 @@ enum {
 #define GESTURE_MODAL_OUT			10
 
 
-#endif	/* WM_EVENT_TYPES_H */
+#endif	/* __WM_EVENT_TYPES_H__ */
 
diff --git a/source/blender/windowmanager/wm_files.h b/source/blender/windowmanager/wm_files.h
index 64f05e7c581..f373530b5e6 100644
--- a/source/blender/windowmanager/wm_files.h
+++ b/source/blender/windowmanager/wm_files.h
@@ -28,10 +28,10 @@
  *  \ingroup wm
  */
 
-#ifndef WM_FILES_H
-#define WM_FILES_H
+#ifndef __WM_FILES_H__
+#define __WM_FILES_H__
 
 void WM_read_history(void);
 
-#endif /* WM_FILES_H */
+#endif /* __WM_FILES_H__ */
 
diff --git a/source/blender/windowmanager/wm_subwindow.h b/source/blender/windowmanager/wm_subwindow.h
index 6fecefe5479..5017977952b 100644
--- a/source/blender/windowmanager/wm_subwindow.h
+++ b/source/blender/windowmanager/wm_subwindow.h
@@ -29,8 +29,8 @@
  */
 
 
-#ifndef WM_SUBWINDOW_H
-#define WM_SUBWINDOW_H
+#ifndef __WM_SUBWINDOW_H__
+#define __WM_SUBWINDOW_H__
 
 
 /* *************** internal api ************** */
@@ -50,5 +50,5 @@ void	wm_subwindow_getmatrix(wmWindow *win, int swinid, float mat[][4]);
 
 unsigned int index_to_framebuffer(int index);
 
-#endif /* WM_SUBWINDOW_H */
+#endif /* __WM_SUBWINDOW_H__ */
 
diff --git a/source/blender/windowmanager/wm_window.h b/source/blender/windowmanager/wm_window.h
index ec6d815cfc2..27eb4542877 100644
--- a/source/blender/windowmanager/wm_window.h
+++ b/source/blender/windowmanager/wm_window.h
@@ -29,8 +29,8 @@
  */
 
 
-#ifndef WM_WINDOW_H
-#define WM_WINDOW_H
+#ifndef __WM_WINDOW_H__
+#define __WM_WINDOW_H__
 
 struct bScreen;
 struct wmOperator;
@@ -70,5 +70,5 @@ void		wm_window_testbreak		(void);
 int			wm_window_duplicate_exec(bContext *C, struct wmOperator *op);
 int			wm_window_fullscreen_toggle_exec(bContext *C, struct wmOperator *op);
 
-#endif /* WM_WINDOW_H */
+#endif /* __WM_WINDOW_H__ */