2 files changed, 3 insertions, 1 deletions
diff --git a/fmacros.h b/fmacros.h
index 24c9bac..14fed60 100644
--- a/fmacros.h
+++ b/fmacros.h
@@ -13,8 +13,10 @@
 #if defined(__sun__)
 #define _POSIX_C_SOURCE 200112L
 #else
+#if !(defined(__APPLE__) && defined(__MACH__))
 #define _XOPEN_SOURCE 600
 #endif
+#endif
 
 #if defined(__APPLE__) && defined(__MACH__)
 #define _OSX
diff --git a/sds.h b/sds.h
index 394f8b5..13be75a 100644
--- a/sds.h
+++ b/sds.h
@@ -79,7 +79,7 @@ struct __attribute__ ((__packed__)) sdshdr64 {
 #define SDS_TYPE_64 4
 #define SDS_TYPE_MASK 7
 #define SDS_TYPE_BITS 3
-#define SDS_HDR_VAR(T,s) struct sdshdr##T *sh = (void*)((s)-(sizeof(struct sdshdr##T)));
+#define SDS_HDR_VAR(T,s) struct sdshdr##T *sh = (struct sdshdr##T *)((s)-(sizeof(struct sdshdr##T)));
 #define SDS_HDR(T,s) ((struct sdshdr##T *)((s)-(sizeof(struct sdshdr##T))))
 #define SDS_TYPE_5_LEN(f) ((f)>>SDS_TYPE_BITS)