diff --git a/ChangeLog b/ChangeLog
index 4b69177..6598bce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -20,6 +20,8 @@
 	override jit_builtin_apply.
 	* jit/jit-apply-arm.c (_jit_create_indirector, _jit_pad_buffer): add
 	functions.
+	* jit/jit-apply-func.h: for each jit_builtin_* macro add individual
+	check if it's already defined.
 
 2009-01-30  Peter Fristedt  <fristedt@gmail.com>
             Kirill Kononenko  <Kirill.Kononenko@gmail.com>
diff --git a/jit/jit-apply-func.h b/jit/jit-apply-func.h
index 707e2af..0cf1926 100644
--- a/jit/jit-apply-func.h
+++ b/jit/jit-apply-func.h
@@ -42,43 +42,53 @@
 #endif
 
 #if !defined(jit_builtin_apply)
-
 #define	jit_builtin_apply(func,args,size,return_float,return_buf)	\
 		do { \
 			(return_buf) = __builtin_apply \
 					((void (*)())(func), (args), (size)); \
 		} while (0)
+#endif
 
+#if !defined(jit_builtin_apply_args)
 #define	jit_builtin_apply_args(type,args)	\
 		do { \
 			(args) = (type)__builtin_apply_args(); \
 		} while (0)
+#endif
 
+#if !defined(jit_builtin_return_int)
 #define	jit_builtin_return_int(return_buf)	\
 		do { \
 			__builtin_return((return_buf)); \
 		} while (0)
+#endif
 
+#if !defined(jit_builtin_return_long)
 #define	jit_builtin_return_long(return_buf)	\
 		do { \
 			__builtin_return((return_buf)); \
 		} while (0)
+#endif
 
+#if !defined(jit_builtin_return_float)
 #define	jit_builtin_return_float(return_buf)	\
 		do { \
 			__builtin_return((return_buf)); \
 		} while (0)
+#endif
 
+#if !defined(jit_builtin_return_double)
 #define	jit_builtin_return_double(return_buf)	\
 		do { \
 			__builtin_return((return_buf)); \
 		} while (0)
+#endif
 
+#if !defined(jit_builtin_return_nfloat)
 #define	jit_builtin_return_nfloat(return_buf)	\
 		do { \
 			__builtin_return((return_buf)); \
 		} while (0)
-
 #endif
 
 /*