diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index 7af0e50d9c..803ba47f8d 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,3 +1,9 @@
+2011-01-04	Joel Sherrill <joel.sherrill@oarcorp.com>
+
+	* libcsupport/src/error.c: Scheduler Simulator compilation always
+	defines __RTEMS_VIOLATE_KERNEL_VISIBILITY__. So avoid redefinition
+	warning.
+
 2011-01-04	Joel Sherrill <joel.sherrill@oarcorp.com>
 
 	* libfs/src/imfs/imfs.h, libfs/src/imfs/imfs_readlink.c: readlink
diff --git a/cpukit/libcsupport/src/error.c b/cpukit/libcsupport/src/error.c
index 666da76b8b..074707c54c 100644
--- a/cpukit/libcsupport/src/error.c
+++ b/cpukit/libcsupport/src/error.c
@@ -43,7 +43,12 @@
  *        }
  */
 
-#define __RTEMS_VIOLATE_KERNEL_VISIBILITY__
+/* This is always defined on RTEMS Scheduler Simulator and thus
+ * we get a redefined warning if this is not present.
+ */
+#ifndef __RTEMS_VIOLATE_KERNEL_VISIBILITY__
+  #define __RTEMS_VIOLATE_KERNEL_VISIBILITY__
+#endif
 #include <rtems.h>
 
 #include <rtems/error.h>