diff options
Diffstat (limited to 'mcop')
| -rw-r--r-- | mcop/dispatcher.cpp | 19 | ||||
| -rw-r--r-- | mcop/md5auth.cpp | 16 |
2 files changed, 18 insertions, 17 deletions
diff --git a/mcop/dispatcher.cpp b/mcop/dispatcher.cpp index 580a268..fc3763d 100644 --- a/mcop/dispatcher.cpp +++ b/mcop/dispatcher.cpp @@ -20,7 +20,10 @@ */ -#include <config.h> +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "dispatcher.h" #include "delayedreturn.h" #include "startupmanager.h" @@ -43,14 +46,12 @@ #include <errno.h> #include <iostream> -#if TIME_WITH_SYS_TIME -# include <sys/time.h> -# include <time.h> -#elif HAVE_SYS_TIME_H -# include <sys/time.h> -#else -# include <time.h> -#endif +#if defined(HAVE_SYS_TIME_H) +#include <sys/time.h> +#endif +#if defined(TIME_WITH_SYS_TIME) +#include <time.h> +#endif /* Dispatcher private data class (to ensure binary compatibility) */ diff --git a/mcop/md5auth.cpp b/mcop/md5auth.cpp index 5278870..9811641 100644 --- a/mcop/md5auth.cpp +++ b/mcop/md5auth.cpp @@ -20,7 +20,9 @@ */ -#include <config.h> +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include <sys/utsname.h> #include <sys/types.h> @@ -32,13 +34,11 @@ #include <assert.h> #include <stdlib.h> -#if TIME_WITH_SYS_TIME -# include <sys/time.h> -# include <time.h> -#elif HAVE_SYS_TIME_H -# include <sys/time.h> -#else -# include <time.h> +#if defined(HAVE_SYS_TIME_H) +#include <sys/time.h> +#endif +#if defined(TIME_WITH_SYS_TIME) +#include <time.h> #endif #include "md5.h" |