INN commit: trunk/storage/ovdb (ovdb.c)

INN Commit rra at isc.org
Mon May 25 11:39:39 UTC 2015


    Date: Monday, May 25, 2015 @ 04:39:39
  Author: iulius
Revision: 9887

storage/ovdb/ovdb.c:  Fix build issue when Berkeley DB is not available

ovdb-private.h correctly undefines HAVE_BDB because db.h is not available
but as portable/socket-unix.h was included just after, it was setting again
HAVE_BDB owing to its definition in config.h.

Rearrange the order of the inclusions.

Modified:
  trunk/storage/ovdb/ovdb.c

--------+
 ovdb.c |    9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

Modified: ovdb.c
===================================================================
--- ovdb.c	2015-05-25 10:06:51 UTC (rev 9886)
+++ ovdb.c	2015-05-25 11:39:39 UTC (rev 9887)
@@ -105,15 +105,14 @@
 #include "inn/paths.h"
 #include "inn/storage.h"
 
-#include "inn/ov.h"
-#include "ovinterface.h"
-#include "ovdb.h"
-#include "ovdb-private.h"
-
 #ifdef HAVE_UNIX_DOMAIN_SOCKETS
 # include "portable/socket-unix.h"
 #endif
 
+#include "inn/ov.h"
+#include "ovinterface.h"
+#include "ovdb.h"
+#include "ovdb-private.h"
 #ifndef HAVE_BDB
 
 /* Provide stub functions if we don't have db */



More information about the inn-committers mailing list