Module Name: src
Committed By: he
Date: Wed Apr 13 12:40:54 UTC 2011
Modified Files:
src/lib/librumphijack: hijack.c
Log Message:
Move the forward declaration of _sys_readlink() outside of the #if,
so that the build succeeds even if _FORTIFY_SOURCE isn't > 0.
To generate a diff of this commit:
cvs rdiff -u -r1.87 -r1.88 src/lib/librumphijack/hijack.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/librumphijack/hijack.c
diff -u src/lib/librumphijack/hijack.c:1.87 src/lib/librumphijack/hijack.c:1.88
--- src/lib/librumphijack/hijack.c:1.87 Tue Apr 12 19:49:48 2011
+++ src/lib/librumphijack/hijack.c Wed Apr 13 12:40:54 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: hijack.c,v 1.87 2011/04/12 19:49:48 christos Exp $ */
+/* $NetBSD: hijack.c,v 1.88 2011/04/13 12:40:54 he Exp $ */
/*-
* Copyright (c) 2011 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: hijack.c,v 1.87 2011/04/12 19:49:48 christos Exp $");
+__RCSID("$NetBSD: hijack.c,v 1.88 2011/04/13 12:40:54 he Exp $");
#define __ssp_weak_name(fun) _hijack_ ## fun
@@ -1970,10 +1970,11 @@
(int, int), \
(fd, how))
+ssize_t _sys_readlink(const char * __restrict, char * __restrict, size_t);
+
#if _FORTIFY_SOURCE > 0
#define STUB(fun) __ssp_weak_name(fun)
ssize_t STUB(readlink)(const char * __restrict, char * __restrict, size_t);
-ssize_t _sys_readlink(const char * __restrict, char * __restrict, size_t);
ssize_t
STUB(readlink)(const char * __restrict path, char * __restrict buf,
size_t bufsiz)
