From: Daniel Kouřil <kouril@ics.muni.cz>
Date: Tue, 13 Dec 2011 09:12:48 +0000 (+0000)
Subject: All #include's moved to the _locl header
X-Git-Tag: merge_30_head_take2_after~8
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=18a43a08b11d2e663f6cb04d081a31679f262642;p=jra1mw.git

All #include's moved to the _locl header
---

diff --git a/emi.canl.canl-c/src/canl.c b/emi.canl.canl-c/src/canl.c
index af38e0f..0d13e6a 100644
--- a/emi.canl.canl-c/src/canl.c
+++ b/emi.canl.canl-c/src/canl.c
@@ -1,16 +1,10 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <arpa/inet.h>
 #include "canl_locl.h"
-#include "sys/socket.h"
-#include "string.h"
-
 
 static void io_destroy(glb_ctx *cc, io_handler *io);
 static int init_io_content(glb_ctx *cc, io_handler *io);
 static int try_connect(glb_ctx *glb_cc, io_handler *io_cc, char *addr,
         int addrtype, int port, struct timeval *timeout);
+
 canl_ctx canl_create_ctx()
 {
     glb_ctx *ctx = NULL;
diff --git a/emi.canl.canl-c/src/canl_cert.c b/emi.canl.canl-c/src/canl_cert.c
index 503b56d..5c011c1 100644
--- a/emi.canl.canl-c/src/canl_cert.c
+++ b/emi.canl.canl-c/src/canl_cert.c
@@ -1,4 +1,5 @@
 #include "canl_locl.h"
+
 static int set_cert(glb_ctx *cc, X509 *cert);
 static int set_key_file(glb_ctx *cc, char *key);
 static int set_cert_file(glb_ctx *cc, char *cert);
diff --git a/emi.canl.canl-c/src/canl_dns.c b/emi.canl.canl-c/src/canl_dns.c
index 28c683d..3310cbd 100644
--- a/emi.canl.canl-c/src/canl_dns.c
+++ b/emi.canl.canl-c/src/canl_dns.c
@@ -1,8 +1,3 @@
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <string.h>
 #include "canl_locl.h"
 
 static int decrement_timeout(struct timeval *timeout, struct timeval before, struct timeval after);
diff --git a/emi.canl.canl-c/src/canl_err.c b/emi.canl.canl-c/src/canl_err.c
index 2d13158..df34045 100644
--- a/emi.canl.canl-c/src/canl_err.c
+++ b/emi.canl.canl-c/src/canl_err.c
@@ -1,8 +1,3 @@
-#define _GNU_SOURCE //vasprintf
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
 #include "canl_locl.h"
 
 #define ERR_CODE_LEN 512
diff --git a/emi.canl.canl-c/src/canl_locl.h b/emi.canl.canl-c/src/canl_locl.h
index 9d11e49..2906440 100644
--- a/emi.canl.canl-c/src/canl_locl.h
+++ b/emi.canl.canl-c/src/canl_locl.h
@@ -1,6 +1,7 @@
 #ifndef _CANL_LOCL_H
 #define _CANL_LOCL_H
 
+
 #include <errno.h>
 #include <ares.h>
 #include <ares_version.h>
@@ -13,6 +14,20 @@
 #include <openssl/safestack.h>
 #include <unistd.h>
 #include <fcntl.h>
+#define _GNU_SOURCE
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdarg.h>
+#include <stdarg.h>
+#include <sys/types.h>
+#include <sys/time.h>
+
+#include <arpa/inet.h>
+#include <sys/socket.h>
+#include <string.h>
+
+
+
 
 #include "canl.h"
 
diff --git a/emi.canl.canl-c/src/canl_sample_client.c b/emi.canl.canl-c/src/canl_sample_client.c
index 839e5c1..44d64e5 100644
--- a/emi.canl.canl-c/src/canl_sample_client.c
+++ b/emi.canl.canl-c/src/canl_sample_client.c
@@ -2,7 +2,8 @@
 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
-#include "canl.h"
+
+#include <canl.h>
 
 #define BUF_LEN 1000
 
diff --git a/emi.canl.canl-c/src/canl_sample_server.c b/emi.canl.canl-c/src/canl_sample_server.c
index 8bba82f..c3a1c28 100644
--- a/emi.canl.canl-c/src/canl_sample_server.c
+++ b/emi.canl.canl-c/src/canl_sample_server.c
@@ -4,7 +4,8 @@
 #include <string.h>
 #include <netdb.h>
 #include <errno.h>
-#include "canl.h"
+
+#include <canl.h>
 
 #define BUF_LEN 1000
 #define BACKLOG 10