I noticed that the handling of config.h was fairly inconsistent across
the source. This patch makes things more consistent:
1) Include config.h first and in every source file.
2) Always include config.h, not conditionally on WIN32 as was done in
some files.
3) Define _GNU_SOURCE in config.h so it is defined for every file, and
not just in a few.
4) Remove MATAHARI_PORT from config.h, it's in matahari.h.
Signed-off-by: Russell Bryant <rbryant(a)redhat.com>
---
src/broker/broker_linux.c | 2 ++
src/host/host-dbus.c | 2 ++
src/host/host-qmf.cpp | 2 --
src/include/config.h.in | 4 +++-
src/lib/dnssrv.c | 2 --
src/lib/dnssrv_linux.c | 2 ++
src/lib/dnssrv_windows.c | 2 ++
src/lib/host.c | 2 --
src/lib/host_windows.c | 2 ++
src/lib/mainloop.c | 4 +---
src/lib/mh_agent.cpp | 2 ++
src/lib/mh_dbus_common.c | 2 ++
src/lib/network.c | 4 +---
src/lib/network_linux.c | 5 ++++-
src/lib/network_windows.c | 4 ++--
src/lib/services.c | 4 +++-
src/lib/services_linux.c | 3 ++-
src/lib/services_windows.c | 3 +++
src/lib/sysconfig.c | 2 ++
src/lib/sysconfig_linux.c | 2 --
src/lib/sysconfig_windows.c | 2 ++
src/lib/utilities.c | 1 -
src/network/network-dbus.c | 2 ++
src/network/network-qmf.cpp | 2 --
src/service/service-dbus.c | 2 ++
src/service/service-qmf-console.cpp | 2 --
src/service/service-qmf.cpp | 2 --
src/sysconfig/sysconfig-console.cpp | 2 --
src/sysconfig/sysconfig-qmf.cpp | 2 --
29 files changed, 41 insertions(+), 31 deletions(-)
diff --git a/src/broker/broker_linux.c b/src/broker/broker_linux.c
index 6dd98e8..997734f 100644
--- a/src/broker/broker_linux.c
+++ b/src/broker/broker_linux.c
@@ -16,6 +16,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include "config.h"
+
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
diff --git a/src/host/host-dbus.c b/src/host/host-dbus.c
index d01cc97..4f7e51e 100644
--- a/src/host/host-dbus.c
+++ b/src/host/host-dbus.c
@@ -20,6 +20,8 @@
*
*/
+#include "config.h"
+
#include <stdio.h>
#include <string.h>
diff --git a/src/host/host-qmf.cpp b/src/host/host-qmf.cpp
index 7235655..cac7d43 100644
--- a/src/host/host-qmf.cpp
+++ b/src/host/host-qmf.cpp
@@ -22,9 +22,7 @@
* \brief Host QMF Agent
*/
-#ifndef WIN32
#include "config.h"
-#endif
#include <set>
#include "matahari/agent.h"
diff --git a/src/include/config.h.in b/src/include/config.h.in
index fd248ad..48e2e9d 100644
--- a/src/include/config.h.in
+++ b/src/include/config.h.in
@@ -11,6 +11,8 @@
#define LOCAL_STATE_DIR "@localstatedir@"
-#define MATAHARI_PORT @MATAHARI_PORT@
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
+#endif
#endif
diff --git a/src/lib/dnssrv.c b/src/lib/dnssrv.c
index a287e1b..4f346cb 100644
--- a/src/lib/dnssrv.c
+++ b/src/lib/dnssrv.c
@@ -16,9 +16,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef WIN32
#include "config.h"
-#endif
#include <assert.h>
#include <glib.h>
diff --git a/src/lib/dnssrv_linux.c b/src/lib/dnssrv_linux.c
index 3a18c8e..3c5329d 100644
--- a/src/lib/dnssrv_linux.c
+++ b/src/lib/dnssrv_linux.c
@@ -17,6 +17,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "config.h"
+
#include <string.h>
#include <errno.h>
#include <glib.h>
diff --git a/src/lib/dnssrv_windows.c b/src/lib/dnssrv_windows.c
index 78e1507..a1a6de1 100644
--- a/src/lib/dnssrv_windows.c
+++ b/src/lib/dnssrv_windows.c
@@ -17,6 +17,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "config.h"
+
#include "matahari/dnssrv.h"
#include <windows.h>
diff --git a/src/lib/host.c b/src/lib/host.c
index 521189c..2379d44 100644
--- a/src/lib/host.c
+++ b/src/lib/host.c
@@ -16,9 +16,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef WIN32
#include "config.h"
-#endif
#ifdef __linux__
#include <sys/sysinfo.h>
diff --git a/src/lib/host_windows.c b/src/lib/host_windows.c
index 149cc2a..077f1bd 100644
--- a/src/lib/host_windows.c
+++ b/src/lib/host_windows.c
@@ -16,6 +16,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include "config.h"
+
#include <winsock.h>
#include <windows.h>
#include <winbase.h>
diff --git a/src/lib/mainloop.c b/src/lib/mainloop.c
index f739048..a832376 100644
--- a/src/lib/mainloop.c
+++ b/src/lib/mainloop.c
@@ -16,9 +16,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef _GNU_SOURCE
-# define _GNU_SOURCE
-#endif
+#include "config.h"
#include <stdlib.h>
#include <signal.h>
diff --git a/src/lib/mh_agent.cpp b/src/lib/mh_agent.cpp
index bb1a9b6..61f32bf 100644
--- a/src/lib/mh_agent.cpp
+++ b/src/lib/mh_agent.cpp
@@ -16,6 +16,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include "config.h"
+
#ifdef WIN32
#include <windows.h>
int use_stderr = 1;
diff --git a/src/lib/mh_dbus_common.c b/src/lib/mh_dbus_common.c
index ad32017..f2d3860 100644
--- a/src/lib/mh_dbus_common.c
+++ b/src/lib/mh_dbus_common.c
@@ -20,6 +20,8 @@
*
*/
+#include "config.h"
+
#include "matahari/dbus_common.h"
#include "matahari/logging.h"
#include <glib/gi18n.h>
diff --git a/src/lib/network.c b/src/lib/network.c
index 9e6d785..0df4dc5 100644
--- a/src/lib/network.c
+++ b/src/lib/network.c
@@ -16,9 +16,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef WIN32
-# include "config.h"
-#endif
+#include "config.h"
#include "matahari/network.h"
#include "network_private.h"
diff --git a/src/lib/network_linux.c b/src/lib/network_linux.c
index 0bfd8a0..ec821ab 100644
--- a/src/lib/network_linux.c
+++ b/src/lib/network_linux.c
@@ -20,9 +20,12 @@
* Author: Adam Stokes <astokes(a)fedoraproject.org>
*/
-#include "matahari/network.h"
+#include "config.h"
+
#include <string.h>
+#include "matahari/network.h"
+
void
network_os_start(const char *iface)
{
diff --git a/src/lib/network_windows.c b/src/lib/network_windows.c
index fe300e7..d245442 100644
--- a/src/lib/network_windows.c
+++ b/src/lib/network_windows.c
@@ -20,6 +20,8 @@
* Author: Adam Stokes <astokes(a)fedoraproject.org>
*/
+#include "config.h"
+
#ifndef WINVER
# define WINVER 0x0501
#endif
@@ -27,8 +29,6 @@
#include "matahari/network.h"
#include "matahari/utilities.h"
-#include <config.h>
-
#include <glib.h>
#include <windows.h>
diff --git a/src/lib/services.c b/src/lib/services.c
index a62fff2..f8a6f1e 100644
--- a/src/lib/services.c
+++ b/src/lib/services.c
@@ -15,7 +15,9 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#define _GNU_SOURCE
+
+#include "config.h"
+
#include <sys/types.h>
#include <sys/stat.h>
#include <errno.h>
diff --git a/src/lib/services_linux.c b/src/lib/services_linux.c
index fa9eb5d..b1e62b1 100644
--- a/src/lib/services_linux.c
+++ b/src/lib/services_linux.c
@@ -16,7 +16,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#define _GNU_SOURCE
+#include "config.h"
+
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/wait.h>
diff --git a/src/lib/services_windows.c b/src/lib/services_windows.c
index b48805d..dda7b5b 100644
--- a/src/lib/services_windows.c
+++ b/src/lib/services_windows.c
@@ -15,6 +15,9 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+
+#include "config.h"
+
#include <windows.h>
#include <tchar.h>
#include <stdio.h>
diff --git a/src/lib/sysconfig.c b/src/lib/sysconfig.c
index de47481..e559700 100644
--- a/src/lib/sysconfig.c
+++ b/src/lib/sysconfig.c
@@ -16,6 +16,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include "config.h"
+
#include <stdint.h>
#include <stdlib.h>
#include <stdio.h>
diff --git a/src/lib/sysconfig_linux.c b/src/lib/sysconfig_linux.c
index e039b37..2a3dd62 100644
--- a/src/lib/sysconfig_linux.c
+++ b/src/lib/sysconfig_linux.c
@@ -16,9 +16,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef WIN32
#include "config.h"
-#endif
#include <stdint.h>
#include <stdio.h>
diff --git a/src/lib/sysconfig_windows.c b/src/lib/sysconfig_windows.c
index 2b272e4..977b1fd 100644
--- a/src/lib/sysconfig_windows.c
+++ b/src/lib/sysconfig_windows.c
@@ -16,6 +16,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include "config.h"
+
#include <windows.h>
#include <glib.h>
diff --git a/src/lib/utilities.c b/src/lib/utilities.c
index e4a24f9..68c6582 100644
--- a/src/lib/utilities.c
+++ b/src/lib/utilities.c
@@ -18,7 +18,6 @@
#include "config.h"
-#define _GNU_SOURCE
#include <stdlib.h>
#include <stdio.h>
#include <stdarg.h>
diff --git a/src/network/network-dbus.c b/src/network/network-dbus.c
index ffaf9a4..4c0ab07 100644
--- a/src/network/network-dbus.c
+++ b/src/network/network-dbus.c
@@ -20,6 +20,8 @@
*
*/
+#include "config.h"
+
#include <stdio.h>
#include <string.h>
diff --git a/src/network/network-qmf.cpp b/src/network/network-qmf.cpp
index 9256eb4..2f53c1c 100644
--- a/src/network/network-qmf.cpp
+++ b/src/network/network-qmf.cpp
@@ -16,9 +16,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef WIN32
#include "config.h"
-#endif
#include "matahari/agent.h"
diff --git a/src/service/service-dbus.c b/src/service/service-dbus.c
index 09fcf06..b019d88 100644
--- a/src/service/service-dbus.c
+++ b/src/service/service-dbus.c
@@ -20,6 +20,8 @@
*
*/
+#include "config.h"
+
#include <string.h>
#include "matahari/dbus_common.h"
diff --git a/src/service/service-qmf-console.cpp b/src/service/service-qmf-console.cpp
index e312d73..344773a 100644
--- a/src/service/service-qmf-console.cpp
+++ b/src/service/service-qmf-console.cpp
@@ -14,9 +14,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef WIN32
#include "config.h"
-#endif
#include <qpid/messaging/Connection.h>
#include <qpid/messaging/Duration.h>
diff --git a/src/service/service-qmf.cpp b/src/service/service-qmf.cpp
index 2ad2a75..531c705 100644
--- a/src/service/service-qmf.cpp
+++ b/src/service/service-qmf.cpp
@@ -16,9 +16,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef WIN32
#include "config.h"
-#endif
extern "C" {
#include <stdlib.h>
diff --git a/src/sysconfig/sysconfig-console.cpp b/src/sysconfig/sysconfig-console.cpp
index 016469f..865eda2 100644
--- a/src/sysconfig/sysconfig-console.cpp
+++ b/src/sysconfig/sysconfig-console.cpp
@@ -16,9 +16,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef WIN32
#include "config.h"
-#endif
#include <qpid/messaging/Connection.h>
#include <qpid/messaging/Duration.h>
diff --git a/src/sysconfig/sysconfig-qmf.cpp b/src/sysconfig/sysconfig-qmf.cpp
index a02a018..0b30876 100644
--- a/src/sysconfig/sysconfig-qmf.cpp
+++ b/src/sysconfig/sysconfig-qmf.cpp
@@ -21,9 +21,7 @@
* \brief Sysconfig QMF Agent
*/
-#ifndef WIN32
#include "config.h"
-#endif
#include <qpid/agent/ManagementAgent.h>
#include "qmf/org/matahariproject/QmfPackage.h"
--
1.7.6