mirror of
git://git.gnupg.org/gnupg.git
synced 2024-11-10 21:38:50 +01:00
17bcd08708
* common/libjnlib-config.h: Remove. * common/common-defs.h (getenv) [HAVE_GETENV]: New. From removed header. (getpid) [HAVE_W32CE_SYSTEM]: New. From removed header. * common/argparse.c: Include util.h and common-defs.h. Replace jnlib_ macro names for non-GNUPG builds by x* names. * common/dotlock.c: Ditto. * common/logging.c: Include util.h and common-defs.h. Replace jnlib_ symbol names by x* names. * common/strlist.c: Ditto. * common/utf8conv.c: Ditto. * common/w32-reg.c: Ditto. * common/mischelp.c: Ditto. Also remove _jnlib_free. * common/stringhelp.c: Ditto. (JNLIB_LOG_WITH_PREFIX): Do not depend on this macro. * common/logging.h (JNLIB_LOG_WITH_PREFIX): Do not depend on this macro. -- This is part 1 of the patches to merge the jnlib files into common/. It does not make much sense to keep jnlib/ files separate. They are not often use elsewhere and maintaining the complex marcos stuff is too troublesome for the future. Signed-off-by: Werner Koch <wk@gnupg.org>
45 lines
1.5 KiB
C
45 lines
1.5 KiB
C
/* common-defs.h - Private declarations for common/
|
|
* Copyright (C) 2006 Free Software Foundation, Inc.
|
|
*
|
|
* This file is part of GnuPG.
|
|
*
|
|
* GnuPG is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 3 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* GnuPG 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 General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#ifndef GNUPG_COMMON_COMMON_DEFS_H
|
|
#define GNUPG_COMMON_COMMON_DEFS_H
|
|
|
|
|
|
/* Dummy replacement for getenv. */
|
|
#ifndef HAVE_GETENV
|
|
#define getenv(a) (NULL)
|
|
#endif
|
|
|
|
#ifdef HAVE_W32CE_SYSTEM
|
|
#define getpid() GetCurrentProcessId ()
|
|
#endif
|
|
|
|
|
|
/*-- ttyio.c --*/
|
|
void tty_private_set_rl_hooks (void (*init_stream) (FILE *),
|
|
void (*set_completer) (rl_completion_func_t*),
|
|
void (*inhibit_completion) (int),
|
|
void (*cleanup_after_signal) (void),
|
|
char *(*readline_fun) (const char*),
|
|
void (*add_history_fun) (const char*));
|
|
|
|
|
|
|
|
#endif /*GNUPG_COMMON_COMMON_DEFS_H*/
|