X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=error.h;h=40e097e33cd180fae9b1f3709dcd362a563ffd81;hb=7eab3b26d6c5094ad13bf64ac07eaed57f7b69a0;hp=379d37326782f308ce6b7e576c25383ea1b7b8c7;hpb=1fd34762208566dfe2d2e07772e4af088f833a2b;p=paraslash.git

diff --git a/error.h b/error.h
index 379d3732..40e097e3 100644
--- a/error.h
+++ b/error.h
@@ -279,6 +279,7 @@ extern const char **para_errlist[];
 	PARA_ERROR(NO_AFHI, "audio format handler info required"), \
 	PARA_ERROR(AFT_SYNTAX, "audio file table syntax error"), \
 	PARA_ERROR(HASH_MISMATCH, "hash mismatch, consider re-add"), \
+	PARA_ERROR(NO_MATCH, "no matches"), \
 
 
 #define USER_LIST_ERRORS \
@@ -578,6 +579,8 @@ extern const char **para_errlist[];
 /** Set the osl error bit for the given number. */
 #define OSL_ERRNO_TO_PARA_ERROR(num) ((num) | (1 << OSL_ERROR_BIT))
 
+
+static const char *weak_osl_strerror(int) __attribute__ ((weakref("osl_strerror")));
 /**
  * Paraslash's version of strerror(3).
  *
@@ -588,10 +591,10 @@ extern const char **para_errlist[];
 _static_inline_ const char *para_strerror(int num)
 {
 	assert(num > 0);
-#ifdef _OSL_H
-	if (IS_OSL_ERROR(num))
-		return osl_strerror(num & ~(1U << OSL_ERROR_BIT));
-#endif
+	if (IS_OSL_ERROR(num)) {
+		assert(weak_osl_strerror);
+		return weak_osl_strerror(num & ~(1U << OSL_ERROR_BIT));
+	}
 	if (IS_SYSTEM_ERROR(num))
 		return strerror(num & ~(1U << SYSTEM_ERROR_BIT));
 	return para_errlist[ERRNUM_TO_SS(num)][ERRNUM_TO_INDEX(num)];