Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/lib/librumphijack Move the forward declaration of _sys_readl...



details:   https://anonhg.NetBSD.org/src/rev/35db41cf3650
branches:  trunk
changeset: 764179:35db41cf3650
user:      he <he%NetBSD.org@localhost>
date:      Wed Apr 13 12:40:54 2011 +0000

description:
Move the forward declaration of _sys_readlink() outside of the #if,
so that the build succeeds even if _FORTIFY_SOURCE isn't > 0.

diffstat:

 lib/librumphijack/hijack.c |  7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diffs (31 lines):

diff -r 279ae9d02455 -r 35db41cf3650 lib/librumphijack/hijack.c
--- a/lib/librumphijack/hijack.c        Wed Apr 13 11:10:49 2011 +0000
+++ b/lib/librumphijack/hijack.c        Wed Apr 13 12:40:54 2011 +0000
@@ -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)



Home | Main Index | Thread Index | Old Index