fabrics: Made more includes conditional on fabrics support

Made more fabrics-specific and netdb-specific  includes conditional
on fabrics and netdb support.  Also removed unneeded ioctl.h include
from logging.c.

Signed-off-by: Broc Going <[email protected]>

Author: bgoing-micron-oss

libnvme/src/nvme/util.c

@@ -17,12 +17,12 @@
 #include <unistd.h>
 
 #if defined(HAVE_NETDB) || defined(CONFIG_FABRICS)
-#include <sys/types.h>
 #include <ifaddrs.h>
-#endif
 
 #include <arpa/inet.h>
 #include <netdb.h>
+#endif
+
 #include <sys/param.h>
 #include <sys/stat.h>
 #include <sys/types.h>

logging.c

@@ -6,7 +6,6 @@
 #include <stdint.h>
 #include <string.h>
 
-#include <sys/ioctl.h>
 #include <sys/time.h>
 
 #include <ccan/endian/endian.h>

nvme-print-json.c

@@ -4,8 +4,12 @@
 #include <errno.h>
 #include <time.h>
 #include <sys/types.h>
+
+#ifdef CONFIG_FABRICS
 #include <sys/socket.h>
 #include <arpa/inet.h>
+#endif
+
 #include <ccan/compiler/compiler.h>
 
 #include <libnvme.h>

nvme-print-stdout.c

@@ -7,8 +7,12 @@
 #include <time.h>
 #include <sys/stat.h>
 #include <sys/types.h>
+
+#ifdef CONFIG_FABRICS
 #include <sys/socket.h>
 #include <arpa/inet.h>
+#endif
+
 #include <ccan/strset/strset.h>
 #include <ccan/htable/htable_type.h>
 #include <ccan/htable/htable.h>