--- ../lcms-1.18/src/cmsio1.c	2009-03-21 16:31:52.000000000 +0100
+++ src/cmsio1.c	2009-07-04 00:06:21.290024025 +0200
@@ -22,9 +22,15 @@
 
 // ICC profile serialization
 
+#ifndef __BEOS__
+#define _XOPEN_SOURCE
+#endif
 
+#define _BSD_SOURCE
+#include <string.h>
 #include "lcms.h"
 
+
 // ----------------------------------------------------------------- Tag Serialization
 
 // Alignment of ICC file format uses 4 bytes DWORD
@@ -35,13 +41,7 @@
 static int GlobalLanguageCode;   // Language & country descriptors, for ICC 4.0 support
 static int GlobalCountryCode;
 
-                           
 #ifdef __BEOS__
-#       define USE_CUSTOM_SWAB  1
-#endif
-
-
-#ifdef USE_CUSTOM_SWAB
 
 // Replacement to swab function, thanks to YNOP
 // for providing the BeOS port