From c921feb829e79a33938300350e61e3c3fb217968 Mon Sep 17 00:00:00 2001
From: Michael Steinert <mike.steinert@gmail.com>
Date: Wed, 16 May 2012 12:13:31 -0600
Subject: Set default visibility to hidden & enable a couple more warnings

Enable the following GCC options:

1. -Wstrict-prototypes
2. -Wcast-align
3. -fno-common
4. -fvisibility=hidden

This commit also includes some general cleanup of header files (mostly
for readability).

Signed-off-by: Michael Steinert <mike.steinert@gmail.com>
---
 librabbitmq/unix/socket.c | 24 +++++++++++++++++-------
 librabbitmq/unix/socket.h | 25 +++++++++++--------------
 2 files changed, 28 insertions(+), 21 deletions(-)

(limited to 'librabbitmq/unix')

diff --git a/librabbitmq/unix/socket.c b/librabbitmq/unix/socket.c
index d0e2400..cb8a2b9 100644
--- a/librabbitmq/unix/socket.c
+++ b/librabbitmq/unix/socket.c
@@ -34,17 +34,27 @@
 #include "config.h"
 #endif
 
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <unistd.h>
+#include "amqp_private.h"
+#include "socket.h"
 #include <fcntl.h>
 #include <stdint.h>
-#include <string.h>
 #include <stdlib.h>
+#include <string.h>
+#include <sys/socket.h>
+#include <sys/types.h>
+#include <unistd.h>
 
-#include "amqp.h"
-#include "amqp_private.h"
-#include "socket.h"
+int
+amqp_socket_init(void)
+{
+	return 0;
+}
+
+int
+amqp_socket_error(void)
+{
+	return errno | ERROR_CATEGORY_OS;
+}
 
 int amqp_socket_socket(int domain, int type, int proto)
 {
diff --git a/librabbitmq/unix/socket.h b/librabbitmq/unix/socket.h
index af86ffb..ff6fa73 100644
--- a/librabbitmq/unix/socket.h
+++ b/librabbitmq/unix/socket.h
@@ -34,28 +34,25 @@
  */
 
 #include <errno.h>
-#include <sys/types.h>
-#include <unistd.h>
-#include <sys/uio.h>
-#include <sys/socket.h>
 #include <netdb.h>
 #include <netinet/in.h>
 #include <netinet/tcp.h>
+#include <sys/socket.h>
+#include <sys/types.h>
+#include <sys/uio.h>
+#include <unistd.h>
 
-static inline int amqp_socket_init(void)
-{
-	return 0;
-}
+int
+amqp_socket_init(void);
 
-extern int amqp_socket_socket(int domain, int type, int proto);
+int
+amqp_socket_socket(int domain, int type, int proto);
+
+int
+amqp_socket_error(void);
 
 #define amqp_socket_setsockopt setsockopt
 #define amqp_socket_close close
 #define amqp_socket_writev writev
 
-static inline int amqp_socket_error()
-{
-	return errno | ERROR_CATEGORY_OS;
-}
-
 #endif
-- 
cgit v1.2.1