define generic symbols carefully
diff --git a/ChangeLog b/ChangeLog
index 0e9ec8d..cec7647 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,13 @@
 
 	* src/closures.c (selinux_enabled_check): Fix strncmp usage bug.
 
+2010-07-07  Dan Horák <dan@danny.cz>
+
+	* include/ffi.h.in: Protect #define with #ifndef.
+	* src/powerpc/ffitarget.h: Ditto.
+	* src/s390/ffitarget.h: Ditto.
+	* src/sparc/ffitarget.h: Ditto.
+
 2010-05-11  Dan Witte  <dwitte@mozilla.com>
 
 	* doc/libffi.tex: Document previous change.