Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/intern
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2019-01-10 00:46:38 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-01-10 01:04:44 +0300
commit5100e4419eb1651886d38d3fa62dec80481a3628 (patch)
treedd2c0f8c548a9753f0e13ca85d3f2684507ff795 /intern
parentf87b93a567fa86ffe784506a1648e4828cfe6272 (diff)
Cleanup: ensure header guards come first
Causes clang-format not to detect header guards, indenting all preprocessor lines in the header.
Diffstat (limited to 'intern')
-rw-r--r--intern/clog/CLG_log.h6
-rw-r--r--intern/ghost/intern/GHOST_EventNDOF.h7
-rw-r--r--intern/ghost/intern/GHOST_NDOFManager.h7
3 files changed, 9 insertions, 11 deletions
diff --git a/intern/clog/CLG_log.h b/intern/clog/CLG_log.h
index 61fc93be9e7..390122289b1 100644
--- a/intern/clog/CLG_log.h
+++ b/intern/clog/CLG_log.h
@@ -18,8 +18,8 @@
* ***** END GPL LICENSE BLOCK *****
*/
-#ifndef __CLOG_H__
-#define __CLOG_H__
+#ifndef __CLG_LOG_H__
+#define __CLG_LOG_H__
/** \file clog/CLG_log.h
* \ingroup clog
@@ -211,4 +211,4 @@ void CLG_logref_init(CLG_LogRef *clg_ref);
}
#endif
-#endif /* __CLOG_H__ */
+#endif /* __CLG_LOG_H__ */
diff --git a/intern/ghost/intern/GHOST_EventNDOF.h b/intern/ghost/intern/GHOST_EventNDOF.h
index b81f74becee..a7a7639c98e 100644
--- a/intern/ghost/intern/GHOST_EventNDOF.h
+++ b/intern/ghost/intern/GHOST_EventNDOF.h
@@ -24,16 +24,15 @@
* \ingroup GHOST
*/
+#ifndef __GHOST_EVENTNDOF_H__
+#define __GHOST_EVENTNDOF_H__
+
#ifndef WITH_INPUT_NDOF
# error NDOF code included in non-NDOF-enabled build
#endif
-#ifndef __GHOST_EVENTNDOF_H__
-#define __GHOST_EVENTNDOF_H__
-
#include "GHOST_Event.h"
-
class GHOST_EventNDOFMotion : public GHOST_Event
{
protected:
diff --git a/intern/ghost/intern/GHOST_NDOFManager.h b/intern/ghost/intern/GHOST_NDOFManager.h
index 78f24e07a6e..b23673940e6 100644
--- a/intern/ghost/intern/GHOST_NDOFManager.h
+++ b/intern/ghost/intern/GHOST_NDOFManager.h
@@ -21,16 +21,15 @@
* ***** END GPL LICENSE BLOCK *****
*/
+#ifndef __GHOST_NDOFMANAGER_H__
+#define __GHOST_NDOFMANAGER_H__
+
#ifndef WITH_INPUT_NDOF
# error NDOF code included in non-NDOF-enabled build
#endif
-#ifndef __GHOST_NDOFMANAGER_H__
-#define __GHOST_NDOFMANAGER_H__
-
#include "GHOST_System.h"
-
// #define DEBUG_NDOF_MOTION
// #define DEBUG_NDOF_BUTTONS