From: Hannes Reinecke <[email protected]>

config.h should be included first, as it will influence the
contents of other header files.

Signed-off-by: Hannes Reinecke <[email protected]>
---
 utils/open-isns/client.c     | 4 ++--
 utils/open-isns/db-policy.c  | 2 +-
 utils/open-isns/dd.c         | 1 +
 utils/open-isns/deregister.c | 1 +
 utils/open-isns/esi.c        | 1 +
 utils/open-isns/export.c     | 1 +
 utils/open-isns/getnext.c    | 1 +
 utils/open-isns/isnsadm.c    | 2 +-
 utils/open-isns/isnsd.c      | 1 +
 utils/open-isns/isnsdd.c     | 2 ++
 utils/open-isns/local.c      | 3 ++-
 utils/open-isns/pki.c        | 2 +-
 utils/open-isns/policy.c     | 1 +
 utils/open-isns/query.c      | 1 +
 utils/open-isns/register.c   | 1 +
 utils/open-isns/scn.c        | 1 +
 utils/open-isns/scope.c      | 1 +
 utils/open-isns/security.c   | 2 +-
 utils/open-isns/server.c     | 1 +
 utils/open-isns/simple.c     | 1 +
 utils/open-isns/socket.c     | 2 +-
 utils/open-isns/tags.c       | 1 +
 22 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/utils/open-isns/client.c b/utils/open-isns/client.c
index c470048e3d8d..c191736510f6 100644
--- a/utils/open-isns/client.c
+++ b/utils/open-isns/client.c
@@ -11,11 +11,11 @@
 #include <signal.h>
 #include <unistd.h>
 
-#include <isns.h>
+#include "config.h"
+#include "isns.h"
 #include "security.h"
 #include "util.h"
 #include "internal.h"
-#include "config.h"
 
 static isns_client_t *
 __isns_create_default_client(isns_socket_t *sock, isns_security_t *ctx,
diff --git a/utils/open-isns/db-policy.c b/utils/open-isns/db-policy.c
index a85a43665a28..63080fc80237 100644
--- a/utils/open-isns/db-policy.c
+++ b/utils/open-isns/db-policy.c
@@ -7,6 +7,7 @@
 #include <sys/stat.h>
 #include <string.h>
 #include <unistd.h>
+#include "config.h"
 #ifdef WITH_SECURITY
 #include <openssl/pem.h>
 #include <openssl/err.h>
@@ -16,7 +17,6 @@
 #include "objects.h"
 #include "vendor.h"
 #include "util.h"
-#include "config.h"
 
 /*
  * DB keystore
diff --git a/utils/open-isns/dd.c b/utils/open-isns/dd.c
index c2dcd100e4d3..b88d1e7638b4 100644
--- a/utils/open-isns/dd.c
+++ b/utils/open-isns/dd.c
@@ -12,6 +12,7 @@
 
 #include <stdlib.h>
 #include <string.h>
+#include "config.h"
 #include "isns.h"
 #include "attrs.h"
 #include "objects.h"
diff --git a/utils/open-isns/deregister.c b/utils/open-isns/deregister.c
index 3a7b7a6724b8..29c0f43e87ed 100644
--- a/utils/open-isns/deregister.c
+++ b/utils/open-isns/deregister.c
@@ -6,6 +6,7 @@
 
 #include <stdlib.h>
 #include <string.h>
+#include "config.h"
 #include "isns.h"
 #include "attrs.h"
 #include "objects.h"
diff --git a/utils/open-isns/esi.c b/utils/open-isns/esi.c
index 47d52c6e3fb8..d1e04415a24e 100644
--- a/utils/open-isns/esi.c
+++ b/utils/open-isns/esi.c
@@ -7,6 +7,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
+#include "config.h"
 #include "isns.h"
 #include "attrs.h"
 #include "objects.h"
diff --git a/utils/open-isns/export.c b/utils/open-isns/export.c
index fa4c2782921b..4a9d776cd2b1 100644
--- a/utils/open-isns/export.c
+++ b/utils/open-isns/export.c
@@ -14,6 +14,7 @@
 #include <unistd.h>
 #include <ctype.h>
 
+#include "config.h"
 #include "isns.h"
 #include "util.h"
 #include "vendor.h"
diff --git a/utils/open-isns/getnext.c b/utils/open-isns/getnext.c
index 916ee80c01b9..4969f7aa6d72 100644
--- a/utils/open-isns/getnext.c
+++ b/utils/open-isns/getnext.c
@@ -6,6 +6,7 @@
 
 #include <stdlib.h>
 #include <string.h>
+#include "config.h"
 #include "isns.h"
 #include "attrs.h"
 #include "message.h"
diff --git a/utils/open-isns/isnsadm.c b/utils/open-isns/isnsadm.c
index db34f8f7c35e..ea2dcfe39960 100644
--- a/utils/open-isns/isnsadm.c
+++ b/utils/open-isns/isnsadm.c
@@ -11,6 +11,7 @@
 #include <unistd.h>
 #include <limits.h>
 
+#include "config.h"
 #include "isns.h"
 #include "util.h"
 #include "vendor.h"
@@ -18,7 +19,6 @@
 #include "security.h"
 #include "objects.h"
 #include "paths.h"
-#include "config.h"
 
 #define ISNS_DEFAULT_PORT_INITIATOR    860
 #define ISNS_DEFAULT_PORT_TARGET       3260
diff --git a/utils/open-isns/isnsd.c b/utils/open-isns/isnsd.c
index 3f983d600327..751dd08d70aa 100644
--- a/utils/open-isns/isnsd.c
+++ b/utils/open-isns/isnsd.c
@@ -10,6 +10,7 @@
 #include <string.h>
 #include <signal.h>
 #include <unistd.h>
+#include <time.h>
 
 #ifdef MTRACE
 # include <mcheck.h>
diff --git a/utils/open-isns/isnsdd.c b/utils/open-isns/isnsdd.c
index e4e212d121c1..850060a53294 100644
--- a/utils/open-isns/isnsdd.c
+++ b/utils/open-isns/isnsdd.c
@@ -16,12 +16,14 @@
 #include <signal.h>
 #include <unistd.h>
 #include <sys/wait.h>
+#include <time.h>
 
 #ifdef MTRACE
 # include <mcheck.h>
 #endif
 
 #include <isns.h>
+#include "config.h"
 #include "security.h"
 #include "util.h"
 #include "isns-proto.h"
diff --git a/utils/open-isns/local.c b/utils/open-isns/local.c
index 4bc1cb1f2a2d..ec7d1a8bcd4e 100644
--- a/utils/open-isns/local.c
+++ b/utils/open-isns/local.c
@@ -32,7 +32,8 @@
 #include <errno.h>
 #include <limits.h>
 
-#include <isns.h>
+#include "config.h"
+#include "isns.h"
 #include "security.h"
 #include "util.h"
 #include "isns-proto.h"
diff --git a/utils/open-isns/pki.c b/utils/open-isns/pki.c
index f3af9220d58c..261e093743de 100644
--- a/utils/open-isns/pki.c
+++ b/utils/open-isns/pki.c
@@ -11,10 +11,10 @@
 #include <openssl/pem.h>
 #include <openssl/err.h>
 #include <fcntl.h>
+#include "config.h"
 #include "isns.h"
 #include "security.h"
 #include "util.h"
-#include "config.h"
 
 #ifdef WITH_SECURITY
 
diff --git a/utils/open-isns/policy.c b/utils/open-isns/policy.c
index 46de15bfb6f4..27da60f4ee9c 100644
--- a/utils/open-isns/policy.c
+++ b/utils/open-isns/policy.c
@@ -8,6 +8,7 @@
  */
 
 #include <string.h>
+#include "config.h"
 #include "isns.h"
 #include "security.h"
 #include "objects.h"
diff --git a/utils/open-isns/query.c b/utils/open-isns/query.c
index b2cfbc9bfdd7..8382de8614c0 100644
--- a/utils/open-isns/query.c
+++ b/utils/open-isns/query.c
@@ -6,6 +6,7 @@
 
 #include <stdlib.h>
 #include <string.h>
+#include "config.h"
 #include "isns.h"
 #include "attrs.h"
 #include "message.h"
diff --git a/utils/open-isns/register.c b/utils/open-isns/register.c
index 120deaed68f1..007cf551c3e9 100644
--- a/utils/open-isns/register.c
+++ b/utils/open-isns/register.c
@@ -7,6 +7,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
+#include "config.h"
 #include "isns.h"
 #include "attrs.h"
 #include "objects.h"
diff --git a/utils/open-isns/scn.c b/utils/open-isns/scn.c
index 51fcba327492..92721e02ba4d 100644
--- a/utils/open-isns/scn.c
+++ b/utils/open-isns/scn.c
@@ -7,6 +7,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
+#include "config.h"
 #include "isns.h"
 #include "attrs.h"
 #include "objects.h"
diff --git a/utils/open-isns/scope.c b/utils/open-isns/scope.c
index 9ee7f9a16dee..844d552b0774 100644
--- a/utils/open-isns/scope.c
+++ b/utils/open-isns/scope.c
@@ -6,6 +6,7 @@
 
 #include <stdlib.h>
 #include <string.h>
+#include "config.h"
 #include "isns.h"
 #include "attrs.h"
 #include "objects.h"
diff --git a/utils/open-isns/security.c b/utils/open-isns/security.c
index 548ce18b43ca..60bd8d744fb3 100644
--- a/utils/open-isns/security.c
+++ b/utils/open-isns/security.c
@@ -7,11 +7,11 @@
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
+#include "config.h"
 #include "isns.h"
 #include "security.h"
 #include "source.h"
 #include "util.h"
-#include "config.h"
 
 #ifdef WITH_SECURITY
 
diff --git a/utils/open-isns/server.c b/utils/open-isns/server.c
index 0f1c93785acc..930d20538b10 100644
--- a/utils/open-isns/server.c
+++ b/utils/open-isns/server.c
@@ -4,6 +4,7 @@
  * Copyright (C) 2007 Olaf Kirch <[email protected]>
  */
 
+#include "config.h"
 #include "isns.h"
 #include "util.h"
 #include "security.h"
diff --git a/utils/open-isns/simple.c b/utils/open-isns/simple.c
index 1af89fd6fec1..e560d63288ac 100644
--- a/utils/open-isns/simple.c
+++ b/utils/open-isns/simple.c
@@ -7,6 +7,7 @@
 
 #include <stdlib.h>
 #include <string.h>
+#include "config.h"
 #include "isns.h"
 #include "attrs.h"
 #include "message.h"
diff --git a/utils/open-isns/socket.c b/utils/open-isns/socket.c
index 47481c6c3f2c..ecf073874bcd 100644
--- a/utils/open-isns/socket.c
+++ b/utils/open-isns/socket.c
@@ -19,12 +19,12 @@
 #include <netdb.h>
 #include <fcntl.h>
 
+#include "config.h"
 #include "buffer.h"
 #include "isns.h"
 #include "socket.h"
 #include "security.h"
 #include "util.h"
-#include "config.h"
 
 #define SOCK_DEBUG_VERBOSE     0
 
diff --git a/utils/open-isns/tags.c b/utils/open-isns/tags.c
index 7413ceea1116..ec6d0f6d3dae 100644
--- a/utils/open-isns/tags.c
+++ b/utils/open-isns/tags.c
@@ -7,6 +7,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <time.h>
+#include "config.h"
 #include "isns-proto.h"
 #include "vendor.h"
 #include "attrs.h"
-- 
2.1.2

-- 
You received this message because you are subscribed to the Google Groups 
"open-iscsi" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to [email protected].
To post to this group, send email to [email protected].
Visit this group at http://groups.google.com/group/open-iscsi.
For more options, visit https://groups.google.com/d/optout.

Reply via email to