From 309416c2918b2e722151a76dbedd74e488ffec49 Mon Sep 17 00:00:00 2001 From: Jonas 'Sortie' Termansen Date: Mon, 28 May 2012 23:03:03 +0200 Subject: [PATCH] Renamed error(3) to gnu_error(3), but with a redirect. This fixes compatibility issues with programs that like to make their own error function. This includes zlib and gzip. --- libmaxsi/include/error.h | 5 ++++- libmaxsi/io.cpp | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libmaxsi/include/error.h b/libmaxsi/include/error.h index 43ad6467..4a65de51 100644 --- a/libmaxsi/include/error.h +++ b/libmaxsi/include/error.h @@ -29,7 +29,10 @@ __BEGIN_DECLS -void error(int status, int errnum, const char *format, ...); +void gnu_error(int status, int errnum, const char *format, ...); +#if __SORTIX_STDLIB_REDIRECTS +void error(int status, int errnum, const char *format, ...) asm("gnu_error"); +#endif __END_DECLS diff --git a/libmaxsi/io.cpp b/libmaxsi/io.cpp index eaa19dbd..5849a64e 100644 --- a/libmaxsi/io.cpp +++ b/libmaxsi/io.cpp @@ -191,7 +191,7 @@ namespace Maxsi return result; } - extern "C" void error(int status, int errnum, const char *format, ...) + extern "C" void gnu_error(int status, int errnum, const char *format, ...) { fprintf(stderr, "%s: ", program_invocation_name);