From 15fc876ad6d9b5c5dd96319c8da51719512fb5f5 Mon Sep 17 00:00:00 2001 From: Love Hornquist Astrand Date: Sat, 13 Mar 2010 10:22:18 -0800 Subject: [PATCH] merge error --- lib/roken/strerror_r.c | 26 -------------------------- 1 file changed, 26 deletions(-) diff --git a/lib/roken/strerror_r.c b/lib/roken/strerror_r.c index e837aab1a..6b6038d70 100644 --- a/lib/roken/strerror_r.c +++ b/lib/roken/strerror_r.c @@ -40,32 +40,6 @@ #include #include "roken.h" -<<<<<<< HEAD -#ifndef HAVE_STRERROR_R -extern int sys_nerr; -extern char *sys_errlist[]; -#endif -======= -#ifdef _MSC_VER - -int ROKEN_LIB_FUNCTION -rk_strerror_r(int eno, char * strerrbuf, size_t buflen) -{ - errno_t err; - - err = strerror_s(strerrbuf, buflen, eno); - if (err != 0) { - int code; - code = sprintf_s(strerrbuf, buflen, "Error % occurred.", eno); - err = ((code != 0)? errno : 0); - } - - return err; -} - -#else /* _MSC_VER */ ->>>>>>> 6da28e7... move same ifdef magic from roken-common.h.in to here, use strerror() - int ROKEN_LIB_FUNCTION rk_strerror_r(int eno, char *strerrbuf, size_t buflen) { -- 2.11.4.GIT