diff options
| author | Albrecht Schlosser <albrechts.fltk@online.de> | 2016-01-31 04:33:54 +0000 |
|---|---|---|
| committer | Albrecht Schlosser <albrechts.fltk@online.de> | 2016-01-31 04:33:54 +0000 |
| commit | 0a6be0a83f368aff7df7e1a9c567d7e16b92a579 (patch) | |
| tree | 0fff69bdb746415afd1449a5e9afc216261fdd2e /src/flstring.h | |
| parent | 642187dc1c99cc041f181438473cda8894564c8b (diff) | |
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
Diffstat (limited to 'src/flstring.h')
| -rw-r--r-- | src/flstring.h | 10 |
1 files changed, 5 insertions, 5 deletions
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 */ |