Compilefix 2020 01a (#420)

* Detect compiler features
* Whitespace changes
* ekr_loop sleep 1 --> 10

7 files changed, 28 insertions, 26 deletions

diff --git a/configure.ac b/configure.ac
index 8825fb91..e24c37cb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -61,7 +61,7 @@ freebsd*)
   LIBCFLAGS="$LIBCFLAGS -U__FreeBSD__ -D__Userspace_os_FreeBSD"
   ;;
 linux*)
-  CFLAGS="$CFLAGS -std=c99 -pthread -D_GNU_SOURCE"
+  CFLAGS="$CFLAGS -std=c99 -pthread -D_GNU_SOURCE -Wno-address-of-packed-member"
   LIBCFLAGS="$LIBCFLAGS -D__Userspace_os_Linux"
   ;;
 netbsd*)
diff --git a/programs/ekr_loop.c b/programs/ekr_loop.c
index 582c1163..d198beda 100644
--- a/programs/ekr_loop.c
+++ b/programs/ekr_loop.c
@@ -514,9 +514,9 @@ main(int argc, char *argv[])
 		}
 		debug_printf("Sending done, sleeping\n");
 #ifdef _WIN32
-		Sleep(1000);
+		Sleep(10000);
 #else
-		sleep(1);
+		sleep(10);
 #endif
 	}
 	free(line);
diff --git a/programs/st_client.c b/programs/st_client.c
index 933a16a8..da5c53bc 100644
--- a/programs/st_client.c
+++ b/programs/st_client.c
@@ -195,7 +195,7 @@ on_socket_readable(struct socket* s) {
 static void
 handle_upcall(struct socket *s, void *arg, int flags)
 {
-    int events = usrsctp_get_events(s);
+	int events = usrsctp_get_events(s);
 
 	if (connecting) {
 		if (events & SCTP_EVENT_ERROR) {
diff --git a/usrsctplib/CMakeLists.txt b/usrsctplib/CMakeLists.txt
index 2d95610a..0b19bce0 100644
--- a/usrsctplib/CMakeLists.txt
+++ b/usrsctplib/CMakeLists.txt
@@ -53,19 +53,23 @@ add_definitions(-DSCTP_PROCESS_LEVEL_LOCKS)
 # OS DEPENDENT
 #################################################
 
+check_c_compiler_flag(-Wno-address-of-packed-member has_wno_address_of_packet_member)
+if (has_wno_address_of_packet_member)
+	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-address-of-packed-member")
+endif ()
+
 if (CMAKE_SYSTEM_NAME MATCHES "Linux")
 	add_definitions(-D_GNU_SOURCE)
 endif ()
 
 if (CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
 	add_definitions(-U__FreeBSD__)
-	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-address-of-packed-member")
 endif ()
 
 if (CMAKE_SYSTEM_NAME MATCHES "Darwin")
 	add_definitions(-U__APPLE__)
 	add_definitions(-D__APPLE_USE_RFC_2292)
-	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-address-of-packed-member -Wno-deprecated-declarations")
+	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-deprecated-declarations")
 endif ()
 
 if (CMAKE_SYSTEM_NAME MATCHES "DragonFly")
diff --git a/usrsctplib/user_socket.c b/usrsctplib/user_socket.c
index 673833d2..146a6d9f 100755
--- a/usrsctplib/user_socket.c
+++ b/usrsctplib/user_socket.c
@@ -580,13 +580,13 @@ struct sctp_generic_sendmsg_args {
 };
 
 struct sctp_generic_recvmsg_args {
-        int sd;
-        struct iovec *iov;
-        int iovlen;
-        struct sockaddr *from;
-        socklen_t *fromlenaddr; /* was __socklen_t */
-        struct sctp_sndrcvinfo *sinfo;
-        int *msg_flags;
+	int sd;
+	struct iovec *iov;
+	int iovlen;
+	struct sockaddr *from;
+	socklen_t *fromlenaddr; /* was __socklen_t */
+	struct sctp_sndrcvinfo *sinfo;
+	int *msg_flags;
 };
 
 
diff --git a/usrsctplib/user_socketvar.h b/usrsctplib/user_socketvar.h
index 470d781f..cd235faf 100755
--- a/usrsctplib/user_socketvar.h
+++ b/usrsctplib/user_socketvar.h
@@ -72,7 +72,7 @@ enum uio_seg {
 #endif
 
 struct proc {
-    int stub; /* struct proc is a dummy for __Userspace__ */
+	int stub; /* struct proc is a dummy for __Userspace__ */
 };
 
 MALLOC_DECLARE(M_ACCF);
@@ -83,12 +83,12 @@ MALLOC_DECLARE(M_SONAME);
  * Removing struct thread *uio_td;    owner field
 */
 struct uio {
-    struct	iovec *uio_iov;		/* scatter/gather list */
-    int		uio_iovcnt;		/* length of scatter/gather list */
-    off_t	uio_offset;		/* offset in target object */
-    ssize_t 	uio_resid;		/* remaining bytes to process */
-    enum	uio_seg uio_segflg;	/* address space */
-    enum	uio_rw uio_rw;		/* operation */
+	struct	iovec *uio_iov;		/* scatter/gather list */
+	int		uio_iovcnt;		/* length of scatter/gather list */
+	off_t	uio_offset;		/* offset in target object */
+	ssize_t 	uio_resid;		/* remaining bytes to process */
+	enum	uio_seg uio_segflg;	/* address space */
+	enum	uio_rw uio_rw;		/* operation */
 };
 
 
diff --git a/usrsctplib/user_uma.h b/usrsctplib/user_uma.h
index 1bdefdb8..e20d2ada 100755
--- a/usrsctplib/user_uma.h
+++ b/usrsctplib/user_uma.h
@@ -46,11 +46,11 @@ typedef struct uma_zone * uma_zone_t;
 typedef struct uma_keg * uma_keg_t;
 
 struct uma_cache {
-    int stub; /* TODO __Userspace__ */
+	int stub; /* TODO __Userspace__ */
 };
 
 struct uma_keg {
-    int stub; /* TODO __Userspace__ */
+	int stub; /* TODO __Userspace__ */
 };
 
 struct uma_zone {
@@ -90,9 +90,7 @@ uma_zcreate(char *name, size_t size, uma_ctor ctor, uma_dtor dtor,
 
 uma_zone_t
 uma_zcreate(char *name, size_t size, uma_ctor ctor, uma_dtor dtor,
-	    uma_init uminit, uma_fini fini, int align, u_int32_t flags)
-{
-    return NULL; /* stub TODO __Userspace__. Also place implementation in a separate .c file */
-
+	    uma_init uminit, uma_fini fini, int align, u_int32_t flags) {
+	return NULL; /* stub TODO __Userspace__. Also place implementation in a separate .c file */
 }
 #endif