From 0a6be0a83f368aff7df7e1a9c567d7e16b92a579 Mon Sep 17 00:00:00 2001 From: Albrecht Schlosser Date: Sun, 31 Jan 2016 04:33:54 +0000 Subject: Fix compiler warnings (STR 2988), porting from branch-1.3. This commit is the accumulated patch introduced in branch 1.3 in svn r 11094, 11095, and 11096. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11097 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- src/flstring.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/flstring.h') diff --git a/src/flstring.h b/src/flstring.h index c575c2069..7c5d2dea6 100644 --- a/src/flstring.h +++ b/src/flstring.h @@ -3,7 +3,7 @@ * * Common string header file for the Fast Light Tool Kit (FLTK). * - * Copyright 1998-2010 by Bill Spitzak and others. + * Copyright 1998-2016 by Bill Spitzak and others. * * This library is free software. Distribution and use rights are outlined in * the file "COPYING" which should have been included with this file. If this @@ -60,12 +60,12 @@ extern "C" { # endif /* __cplusplus */ FL_EXPORT extern int fl_snprintf(char *, size_t, const char *, ...); -# if !HAVE_SNPRINTF +# ifndef HAVE_SNPRINTF # define snprintf fl_snprintf # endif /* !HAVE_SNPRINTF */ FL_EXPORT extern int fl_vsnprintf(char *, size_t, const char *, va_list ap); -# if !HAVE_VSNPRINTF +# ifndef HAVE_VSNPRINTF # define vsnprintf fl_vsnprintf # endif /* !HAVE_VSNPRINTF */ @@ -75,12 +75,12 @@ FL_EXPORT extern int fl_vsnprintf(char *, size_t, const char *, va_list ap); */ FL_EXPORT extern size_t fl_strlcat(char *, const char *, size_t); -# if !HAVE_STRLCAT +# ifndef HAVE_STRLCAT # define strlcat fl_strlcat # endif /* !HAVE_STRLCAT */ FL_EXPORT extern size_t fl_strlcpy(char *, const char *, size_t); -# if !HAVE_STRLCPY +# ifndef HAVE_STRLCPY # define strlcpy fl_strlcpy # endif /* !HAVE_STRLCPY */ -- cgit v1.2.3