aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/objdef.h2
-rw-r--r--src/threading/mutex.h2
-rw-r--r--src/threading/semaphore.h2
-rw-r--r--src/threading/thread.h2
-rw-r--r--src/util/basic_macros.h (renamed from src/basicmacros.h)0
-rw-r--r--src/util/numeric.h2
6 files changed, 5 insertions, 5 deletions
diff --git a/src/objdef.h b/src/objdef.h
index 1dce367a9..77189e454 100644
--- a/src/objdef.h
+++ b/src/objdef.h
@@ -20,7 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#ifndef OBJDEF_HEADER
#define OBJDEF_HEADER
-#include "basicmacros.h"
+#include "util/basic_macros.h"
#include "porting.h"
class IGameDef;
diff --git a/src/threading/mutex.h b/src/threading/mutex.h
index 62a482787..40b10a2ea 100644
--- a/src/threading/mutex.h
+++ b/src/threading/mutex.h
@@ -44,7 +44,7 @@ DEALINGS IN THE SOFTWARE.
#include <pthread.h>
#endif
-#include "basicmacros.h"
+#include "util/basic_macros.h"
class Mutex
{
diff --git a/src/threading/semaphore.h b/src/threading/semaphore.h
index 736f2bc78..822856396 100644
--- a/src/threading/semaphore.h
+++ b/src/threading/semaphore.h
@@ -28,7 +28,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include <semaphore.h>
#endif
-#include "basicmacros.h"
+#include "util/basic_macros.h"
class Semaphore {
public:
diff --git a/src/threading/thread.h b/src/threading/thread.h
index 5f2d8aad1..6a24afffb 100644
--- a/src/threading/thread.h
+++ b/src/threading/thread.h
@@ -26,7 +26,7 @@ DEALINGS IN THE SOFTWARE.
#ifndef THREADING_THREAD_H
#define THREADING_THREAD_H
-#include "basicmacros.h"
+#include "util/basic_macros.h"
#include "threading/atomic.h"
#include "threading/mutex.h"
#include "threads.h"
diff --git a/src/basicmacros.h b/src/util/basic_macros.h
index 2a30a31d2..2a30a31d2 100644
--- a/src/basicmacros.h
+++ b/src/util/basic_macros.h
diff --git a/src/util/numeric.h b/src/util/numeric.h
index 643c44440..e742ab24a 100644
--- a/src/util/numeric.h
+++ b/src/util/numeric.h
@@ -20,7 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#ifndef UTIL_NUMERIC_HEADER
#define UTIL_NUMERIC_HEADER
-#include "../basicmacros.h"
+#include "basic_macros.h"
#include "../irrlichttypes.h"
#include "../irr_v2d.h"
#include "../irr_v3d.h"