[sane-devel] [PATCH v2 07/14] net, move some includes from net.h to net.c

Ruediger Meier sweet_f_a at gmx.de
Mon Jan 23 23:05:52 UTC 2012


From: Ruediger Meier <ruediger.meier at ga-group.nl>

We are doing this allthough these includes are needed in net.h because
1. net.h doesn't have all necessary includes anyway
2. net.c includes the missing headers before net.h
3. we want to add more platform dependent ifdefs to net.c only
---
 backend/net.c |    1 +
 backend/net.h |    3 ---
 2 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/backend/net.c b/backend/net.c
index 16fba2f..dea36ce 100644
--- a/backend/net.c
+++ b/backend/net.c
@@ -64,6 +64,7 @@
 #include <sys/time.h>
 #include <sys/types.h>
 
+#include <sys/socket.h>
 #include <netinet/in.h>
 #include <netdb.h> /* OS/2 needs this _after_ <netinet/in.h>, grrr... */
 
diff --git a/backend/net.h b/backend/net.h
index 7d72fdd..f006164 100644
--- a/backend/net.h
+++ b/backend/net.h
@@ -43,9 +43,6 @@
 #ifndef net_h
 #define net_h
 
-#include <sys/types.h>
-#include <sys/socket.h>
-
 #include "../include/sane/sanei_wire.h"
 #include "../include/sane/config.h"
 
-- 
1.7.6.1




More information about the sane-devel mailing list