2 files changed, 4 insertions, 5 deletions

diff --git a/include/libbb.h b/include/libbb.h
index c5b685985..525162d05 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -340,7 +340,7 @@ typedef struct len_and_sockaddr {
 #if ENABLE_FEATURE_IPV6
                 struct sockaddr_in6 sin6;
 #endif
-        };
+        } u;
 } len_and_sockaddr;
 enum {
         LSA_SIZEOF_SA = sizeof(
diff --git a/include/platform.h b/include/platform.h
index 1706de0bf..2daa077af 100644
--- a/include/platform.h
+++ b/include/platform.h
@@ -154,12 +154,11 @@ typedef int socklen_t;
 
 /* linux/loop.h relies on __u64. Make sure we have that as a proper type
  * until userspace is widely fixed.  */
-#ifndef __GNUC__
-#if defined __INTEL_COMPILER
+#if (defined __INTEL_COMPILER && !defined __GNUC__) || \
+        (defined __GNUC__ && defined __STRICT_ANSI__)
 __extension__ typedef __signed__ long long __s64;
 __extension__ typedef unsigned long long __u64;
-#endif /* __INTEL_COMPILER */
-#endif /* ifndef __GNUC__ */
+#endif
 
 /*----- Kernel versioning ------------------------------------*/
 #define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))