diff --git a/configure.ac b/configure.ac
index 84d0aec1..64469a7f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -382,7 +382,7 @@ AC_ARG_ENABLE(messages,
 
 if test "x$messages" = "xdisabled"; then
   AC_DEFINE(NO_WARNING, 1, [ Define to disable warning messages. ])
-  AC_DEFINE(NO_ERROR,   1, [ Define to disable error messages. ])
+  AC_DEFINE(NO_ERRORMSG,   1, [ Define to disable error messages. ])
   AC_DEFINE(NO_ERETURN, 1, [ Define to disable error messages in combination with a return value (the return is left intact). ])
 fi
 
diff --git a/ports/Sony_PSP/config.h b/ports/Sony_PSP/config.h
index 2a6c600a..957c5e9d 100644
--- a/ports/Sony_PSP/config.h
+++ b/ports/Sony_PSP/config.h
@@ -254,7 +254,7 @@
 /* #undef NO_ERETURN */
 
 /* Define to disable error messages. */
-/* #undef NO_ERROR */
+/* #undef NO_ERRORMSG */
 
 /* Define to disable feeder and buffered readers. */
 /* #undef NO_FEEDER */
diff --git a/src/libmpg123/debug.h b/src/libmpg123/debug.h
index 8cfd67b2..32d471cb 100644
--- a/src/libmpg123/debug.h
+++ b/src/libmpg123/debug.h
@@ -97,7 +97,7 @@
 #endif
 
 /* error macros also here... */
-#ifndef NO_ERROR
+#ifndef NO_ERRORMSG
 #define error(s) fprintf(stderr, "[" __FILE__ ":%i] error: " s "\n", __LINE__)
 #define error1(s, a) fprintf(stderr, "[" __FILE__ ":%i] error: " s "\n", __LINE__, a)
 #define error2(s, a, b) fprintf(stderr, "[" __FILE__ ":%i] error: " s "\n", __LINE__, a, b)