Fix up some include guards and inclusions of config.h.

MoJo4000 · Jan 31, 2019 · e9cb790 · e9cb790
1 parent adf4aa2
commit e9cb790
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 15 deletions.
diff --git a/include/bzsignal.h b/include/bzsignal.h
@@ -9,6 +9,10 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
+
+#ifndef __BZSIGNAL_H__
+#define __BZSIGNAL_H__
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -32,6 +36,8 @@ SIG_PF bzSignal(int signo, SIG_PF func);
 }
 #endif
 
+#endif // __BZSIGNAL_H__
+
 /*
  * Local Variables: ***
  * mode: C++ ***

diff --git a/include/common.h b/include/common.h
@@ -18,12 +18,7 @@
 #define BZF_COMMON_H
 
 /* this should always be the very FIRST header */
-
-#ifdef _DEVCPP /* the Dev-C++ build is acting very stubborn; this is (hopefully) -temporary- */
-# include_next "config.h"
-#else
-# include "config.h"
-#endif
+#include "config.h"
 
 #ifdef _WIN32
 #  undef NOMINMAX

diff --git a/include/version.h b/include/version.h
@@ -10,11 +10,11 @@
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#include "config.h"
-
 #ifndef __VERSION_H__
 #define __VERSION_H__
 
+#include "config.h"
+
 #ifndef BZ_CONFIG_DIR_VERSION
 #define BZ_CONFIG_DIR_VERSION   "2.4"
 #endif

diff --git a/src/bzadmin/CursesMenu.cxx b/src/bzadmin/CursesMenu.cxx
@@ -10,11 +10,6 @@
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-/* Dev-C++ builds successfully if sstream is included before CursesMenu.h */
-#ifdef _DEVCPP
-#   include <sstream>
-#endif
-
 /* interface header */
 #include "CursesMenu.h"
 

diff --git a/src/common/md5.cxx b/src/common/md5.cxx
@@ -19,8 +19,6 @@
  * Still in the public domain.
  */
 
-#include "config.h"
-
 /* for memcpy() */
 #include <string.h>
 /* for stupid systems */