Index: src/c/socket/xmlBlasterSocket.h
===================================================================
--- src/c/socket/xmlBlasterSocket.h	(revision 12923)
+++ src/c/socket/xmlBlasterSocket.h	(working copy)
@@ -30,8 +30,8 @@
 #  define ssize_t signed int
 #else
 #  if defined(__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__hpux__)
+#    include <sys/types.h>   /* Needed for __FreeBSD__ */
 #    include <netinet/in.h>
-#    include <sys/types.h>   /* Needed for __FreeBSD__ */
 #  endif
 #  include <sys/socket.h>
 #  include <netdb.h>
Index: src/c/util/basicDefs.h
===================================================================
--- src/c/util/basicDefs.h	(revision 12923)
+++ src/c/util/basicDefs.h	(working copy)
@@ -81,6 +81,8 @@
 #else
 #  ifdef __cplusplus
 #    define _INLINE_FUNC      /* 'inline' does not compile with g++ */
+#  elif __GNUC__
+#    define _INLINE_FUNC __inline__ /* http://gcc.gnu.org/onlinedocs/gcc/Alternate-Keywords.html */
 #  else
 #    define _INLINE_FUNC inline /* C99 allows to declare functions as 'inline', it has internal linkage -> code to be in same file as call */
 #  endif