Module Name:    src
Committed By:   pooka
Date:           Thu Apr 24 20:12:56 UTC 2014

Modified Files:
        src/include/ssp: string.h

Log Message:
Wrap stpncpy() iff GNUC_PREREQ(4,8).  Fixes USE_SSP=yes builds
with gcc 4.5.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/include/ssp/string.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/include/ssp/string.h
diff -u src/include/ssp/string.h:1.10 src/include/ssp/string.h:1.11
--- src/include/ssp/string.h:1.10	Sun Apr  6 19:29:58 2014
+++ src/include/ssp/string.h	Thu Apr 24 20:12:56 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: string.h,v 1.10 2014/04/06 19:29:58 christos Exp $	*/
+/*	$NetBSD: string.h,v 1.11 2014/04/24 20:12:56 pooka Exp $	*/
 
 /*-
  * Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -31,6 +31,7 @@
 #ifndef _SSP_STRING_H_
 #define _SSP_STRING_H_
 
+#include <sys/cdefs.h>
 #include <ssp/ssp.h>
 
 __BEGIN_DECLS
@@ -93,7 +94,9 @@ __END_DECLS
 #define memmove(dst, src, len) __ssp_bos_check3(memmove, dst, src, len)
 #define memset(dst, val, len) __ssp_bos_check3(memset, dst, val, len)
 #define stpcpy(dst, src) __ssp_bos_check2(stpcpy, dst, src)
+#if __GNUC_PREREQ__(4,8)
 #define stpncpy(dst, src, len) __ssp_bos_check3(stpncpy, dst, src, len)
+#endif
 #define strcpy(dst, src) __ssp_bos_check2(strcpy, dst, src)
 #define strcat(dst, src) __ssp_bos_check2(strcat, dst, src)
 #define strncpy(dst, src, len) __ssp_bos_check3(strncpy, dst, src, len)

Reply via email to