diff options
| author | Werner Koch <wk@gnupg.org> | 2014-08-21 19:50:01 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2014-08-25 16:37:45 +0200 |
| commit | b84c1ee0d637108a74066e0da50cb132273020e9 (patch) | |
| tree | 68f918cd84853d4cc0e314584aafad2125fabd08 | |
| parent | 2b74237d19e44f7173bb052677f0ec35e6ff51b0 (diff) | |
| download | libgpg-error-b84c1ee0d637108a74066e0da50cb132273020e9.tar.gz | |
Add missing redefine macros to cleanup the external symbols.
| -rw-r--r-- | src/estream.c | 4 | ||||
| -rw-r--r-- | src/estream.h | 5 | ||||
| -rw-r--r-- | tests/t-syserror.c | 9 |
3 files changed, 13 insertions, 5 deletions
diff --git a/src/estream.c b/src/estream.c index d211154..8476f8b 100644 --- a/src/estream.c +++ b/src/estream.c @@ -2898,7 +2898,7 @@ es_fopencookie (void *ES__RESTRICT cookie, -estream_t +static estream_t do_fdopen (int filedes, const char *mode, int no_close, int with_locked_list) { unsigned int modeflags; @@ -2948,7 +2948,7 @@ es_fdopen_nc (int filedes, const char *mode) -estream_t +static estream_t do_fpopen (FILE *fp, const char *mode, int no_close, int with_locked_list) { unsigned int modeflags, cmode; diff --git a/src/estream.h b/src/estream.h index def6bd9..52c5083 100644 --- a/src/estream.h +++ b/src/estream.h @@ -73,6 +73,7 @@ #define _ESTREAM_PREFIX2(x,y) _ESTREAM_PREFIX1(x,y) #define _ESTREAM_PREFIX(x) _ESTREAM_PREFIX2(_ESTREAM_EXT_SYM_PREFIX,x) #endif /*_ESTREAM_PREFIX*/ +#define es_init _ESTREAM_PREFIX(es_init) #define es_fopen _ESTREAM_PREFIX(es_fopen) #define es_mopen _ESTREAM_PREFIX(es_mopen) #define es_fopenmem _ESTREAM_PREFIX(es_fopenmem) @@ -92,6 +93,8 @@ #define es_onclose _ESTREAM_PREFIX(es_onclose) #define es_fileno _ESTREAM_PREFIX(es_fileno) #define es_fileno_unlocked _ESTREAM_PREFIX(es_fileno_unlocked) +#define es_syshd _ESTREAM_PREFIX(es_syshd) +#define es_syshd_unlocked _ESTREAM_PREFIX(es_syshd_unlocked) #define es_flockfile _ESTREAM_PREFIX(es_flockfile) #define es_ftrylockfile _ESTREAM_PREFIX(es_ftrylockfile) #define es_funlockfile _ESTREAM_PREFIX(es_funlockfile) @@ -130,6 +133,8 @@ #define es_printf_unlocked _ESTREAM_PREFIX(es_printf_unlocked) #define es_vfprintf _ESTREAM_PREFIX(es_vfprint) #define es_vfprintf_unlocked _ESTREAM_PREFIX(es_vfprint_unlocked) +#define es_asprintf _ESTREAM_PREFIX(es_asprintf) +#define es_vasprintf _ESTREAM_PREFIX(es_vasprintf) #define es_setvbuf _ESTREAM_PREFIX(es_setvbuf) #define es_setbuf _ESTREAM_PREFIX(es_setbuf) #define es_set_binary _ESTREAM_PREFIX(es_set_binary) diff --git a/tests/t-syserror.c b/tests/t-syserror.c index 25de86f..a4cb983 100644 --- a/tests/t-syserror.c +++ b/tests/t-syserror.c @@ -2,17 +2,17 @@ Copyright (C) 2006 g10 Code GmbH This file is part of libgpg-error. - + libgpg-error is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. - + libgpg-error is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. - + You should have received a copy of the GNU Lesser General Public License along with libgpgme-error; if not, write to the Free Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA @@ -38,6 +38,9 @@ main (int argc, char *argv[]) int save_errno; gpg_err_code_t ec; + (void)argc; + (void)argv; + fp = fopen ("/does-not-exist/110761/nowhere.foo", "r"); if (fp) { |