From: Marcel Poul <marcel.poul@cern.ch>
Date: Sat, 17 Dec 2011 00:32:15 +0000 (+0000)
Subject: include some more headers
X-Git-Tag: emi-canl-c_R_1_0_0_0~111
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=27e7288fdb3ac4f8e672d185219d813e047d75d0;p=jra1mw.git

include some more headers
---

diff --git a/emi.canl.canl-c/Makefile b/emi.canl.canl-c/Makefile
index f9b8713..6262c92 100644
--- a/emi.canl.canl-c/Makefile
+++ b/emi.canl.canl-c/Makefile
@@ -108,4 +108,4 @@ stage: all
 	$(MAKE) install PREFIX=${stagedir}
 
 clean:
-	rm -rfv *.o *.lo libcanl.la .libs client server signing_policy.c ${top_srcdir}/*.c ${top_srcdir}/*.h
+	rm -rfv *.o *.lo libcanl.la .libs client server ${top_srcdir}/*.c ${top_srcdir}/*.h lex.backup
diff --git a/emi.canl.canl-c/src/canl_locl.h b/emi.canl.canl-c/src/canl_locl.h
index 9011a7a..e9a0c02 100644
--- a/emi.canl.canl-c/src/canl_locl.h
+++ b/emi.canl.canl-c/src/canl_locl.h
@@ -2,6 +2,8 @@
 #define _CANL_LOCL_H
 
 
+#define _GNU_SOURCE
+#include <stdio.h>
 #include <errno.h>
 #include <ares.h>
 #include <ares_version.h>
@@ -14,8 +16,6 @@
 #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>
diff --git a/emi.canl.canl-c/src/proxy/doio.c b/emi.canl.canl-c/src/proxy/doio.c
index 671c0f4..9019328 100644
--- a/emi.canl.canl-c/src/proxy/doio.c
+++ b/emi.canl.canl-c/src/proxy/doio.c
@@ -28,6 +28,7 @@
 #include <stdio.h>
 #include <stdarg.h>
 #include <stdlib.h>
+#include "doio.h"
 
 char *vsnprintf_wrap(const char *format, va_list v)
 {
@@ -65,7 +66,7 @@ char *snprintf_wrap(const char *format, ...)
 int fileexists(const char *file) 
 {
   FILE *f = fopen(file, "r");
-  close(f);
+  fclose(f);
 
   return f != NULL;
 }
diff --git a/emi.canl.canl-c/src/proxy/sslutils.h b/emi.canl.canl-c/src/proxy/sslutils.h
index adeff08..0e79a86 100644
--- a/emi.canl.canl-c/src/proxy/sslutils.h
+++ b/emi.canl.canl-c/src/proxy/sslutils.h
@@ -55,6 +55,8 @@ EXTERN_C_BEGIN
 #include <stdio.h>
 #include <stdlib.h>
 #include <time.h>
+#include <unistd.h>
+#include <sys/types.h>
 #include "openssl/crypto.h"