Revert prevois for now, the problem is that we have to include
symbols unconditionally, even for those that just needs protos. git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@18520 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
@@ -152,124 +152,82 @@ ROKEN_CPP_START
|
||||
#endif
|
||||
|
||||
#ifndef HAVE_PUTENV
|
||||
#define putenv rk_putenv
|
||||
int ROKEN_LIB_FUNCTION putenv(const char *);
|
||||
#endif
|
||||
|
||||
#if !defined(HAVE_SETENV) || defined(NEED_SETENV_PROTO)
|
||||
#ifndef HAVE_SETENV
|
||||
#define setenv rk_setenv
|
||||
#endif
|
||||
int ROKEN_LIB_FUNCTION setenv(const char *, const char *, int);
|
||||
#endif
|
||||
|
||||
#if !defined(HAVE_UNSETENV) || defined(NEED_UNSETENV_PROTO)
|
||||
#ifndef HAVE_UNSETENV
|
||||
#define unsetenv rk_unsetenv
|
||||
#endif
|
||||
void ROKEN_LIB_FUNCTION unsetenv(const char *);
|
||||
#endif
|
||||
|
||||
#if !defined(HAVE_GETUSERSHELL) || defined(NEED_GETUSERSHELL_PROTO)
|
||||
#ifndef HAVE_GETUSERSHELL
|
||||
#define getusershell rk_getusershell
|
||||
#define endusershell rk_endusershell
|
||||
#endif
|
||||
char * ROKEN_LIB_FUNCTION getusershell(void);
|
||||
void ROKEN_LIB_FUNCTION endusershell(void);
|
||||
#endif
|
||||
|
||||
#if !defined(HAVE_SNPRINTF) || defined(NEED_SNPRINTF_PROTO)
|
||||
#ifndef HAVE_SNPRINTF
|
||||
#define snprintf rk_snprintf
|
||||
#endif
|
||||
int ROKEN_LIB_FUNCTION snprintf (char *, size_t, const char *, ...)
|
||||
__attribute__ ((format (printf, 3, 4)));
|
||||
#endif
|
||||
|
||||
#if !defined(HAVE_VSNPRINTF) || defined(NEED_VSNPRINTF_PROTO)
|
||||
#ifndef HAVE_VSNPRINTF
|
||||
#define vsnprintf rk_vsnprintf
|
||||
#endif
|
||||
int ROKEN_LIB_FUNCTION
|
||||
vsnprintf (char *, size_t, const char *, va_list)
|
||||
__attribute__((format (printf, 3, 0)));
|
||||
#endif
|
||||
|
||||
#if !defined(HAVE_ASPRINTF) || defined(NEED_ASPRINTF_PROTO)
|
||||
#ifndef HAVE_ASPRINTF
|
||||
#define asprintf rk_asprintf
|
||||
#endif
|
||||
int ROKEN_LIB_FUNCTION
|
||||
asprintf (char **, const char *, ...)
|
||||
__attribute__ ((format (printf, 2, 3)));
|
||||
#endif
|
||||
|
||||
#if !defined(HAVE_VASPRINTF) || defined(NEED_VASPRINTF_PROTO)
|
||||
#ifndef HAVE_VASPRINTF
|
||||
#define vasprintf rk_vasprintf
|
||||
#endif
|
||||
int ROKEN_LIB_FUNCTION
|
||||
vasprintf (char **, const char *, va_list)
|
||||
__attribute__((format (printf, 2, 0)));
|
||||
#endif
|
||||
|
||||
#if !defined(HAVE_ASNPRINTF) || defined(NEED_ASNPRINTF_PROTO)
|
||||
#ifndef HAVE_ASNPRINTF
|
||||
#define asnprintf rk_asnprintf
|
||||
#endif
|
||||
int ROKEN_LIB_FUNCTION
|
||||
asnprintf (char **, size_t, const char *, ...)
|
||||
__attribute__ ((format (printf, 3, 4)));
|
||||
#endif
|
||||
|
||||
#if !defined(HAVE_VASNPRINTF) || defined(NEED_VASNPRINTF_PROTO)
|
||||
#ifndef HAVE_VASNPRINTF
|
||||
#define vasnprintf rk_vasnprintf
|
||||
#endif
|
||||
int ROKEN_LIB_FUNCTION
|
||||
vasnprintf (char **, size_t, const char *, va_list)
|
||||
__attribute__((format (printf, 3, 0)));
|
||||
#endif
|
||||
|
||||
#ifndef HAVE_STRDUP
|
||||
#define strdup rk_strdup
|
||||
char * ROKEN_LIB_FUNCTION strdup(const char *);
|
||||
#endif
|
||||
|
||||
#if !defined(HAVE_STRNDUP) || defined(NEED_STRNDUP_PROTO)
|
||||
#ifndef HAVE_STRNDUP
|
||||
#define strndup rk_strndup
|
||||
#endif
|
||||
char * ROKEN_LIB_FUNCTION strndup(const char *, size_t);
|
||||
#endif
|
||||
|
||||
#ifndef HAVE_STRLWR
|
||||
#define strlwr rk_strlwr
|
||||
char * ROKEN_LIB_FUNCTION strlwr(char *);
|
||||
#endif
|
||||
|
||||
#ifndef HAVE_STRNLEN
|
||||
#define strnlen rk_strnlen
|
||||
size_t ROKEN_LIB_FUNCTION strnlen(const char*, size_t);
|
||||
#endif
|
||||
|
||||
#if !defined(HAVE_STRSEP) || defined(NEED_STRSEP_PROTO)
|
||||
#ifndef HAVE_STRSEP
|
||||
#define strsep rk_strsep
|
||||
#endif
|
||||
char * ROKEN_LIB_FUNCTION strsep(char**, const char*);
|
||||
#endif
|
||||
|
||||
#if !defined(HAVE_STRSEP_COPY) || defined(NEED_STRSEP_COPY_PROTO)
|
||||
#ifndef HAVE_STRSEP_COPY
|
||||
#define strsep_copy rk_strsep_copy
|
||||
#endif
|
||||
ssize_t ROKEN_LIB_FUNCTION strsep_copy(const char**, const char*, char*, size_t);
|
||||
#endif
|
||||
|
||||
#ifndef HAVE_STRCASECMP
|
||||
#define strcasecmp rk_strcasecmp
|
||||
int ROKEN_LIB_FUNCTION strcasecmp(const char *, const char *);
|
||||
#endif
|
||||
|
||||
@@ -282,29 +240,22 @@ char * ROKEN_LIB_FUNCTION strtok_r(char *, const char *, char **);
|
||||
#endif
|
||||
|
||||
#ifndef HAVE_STRUPR
|
||||
#define strupr rk_strupr
|
||||
char * ROKEN_LIB_FUNCTION strupr(char *);
|
||||
#endif
|
||||
|
||||
#ifndef HAVE_STRLCPY
|
||||
#define strlcpy rk_strlcpy
|
||||
size_t ROKEN_LIB_FUNCTION strlcpy (char *, const char *, size_t);
|
||||
#endif
|
||||
|
||||
#ifndef HAVE_STRLCAT
|
||||
#define strlcat rk_strlcat
|
||||
size_t ROKEN_LIB_FUNCTION strlcat (char *, const char *, size_t);
|
||||
#endif
|
||||
|
||||
#ifndef HAVE_GETDTABLESIZE
|
||||
#define getdtablesize rk_getdtablesize
|
||||
int ROKEN_LIB_FUNCTION getdtablesize(void);
|
||||
#endif
|
||||
|
||||
#if !defined(HAVE_STRERROR) && !defined(strerror)
|
||||
#ifndef HAVE_STRERROR
|
||||
#define strerror rk_strerror
|
||||
#endif
|
||||
char * ROKEN_LIB_FUNCTION strerror(int);
|
||||
#endif
|
||||
|
||||
@@ -320,26 +271,20 @@ extern int h_errno;
|
||||
#endif
|
||||
|
||||
#if !defined(HAVE_INET_ATON) || defined(NEED_INET_ATON_PROTO)
|
||||
#ifndef HAVE_INET_ATON
|
||||
#define inet_aton rk_inet_aton
|
||||
#endif
|
||||
int ROKEN_LIB_FUNCTION inet_aton(const char *, struct in_addr *);
|
||||
#endif
|
||||
|
||||
#ifndef HAVE_INET_NTOP
|
||||
#define inet_ntop rk_inet_ntop
|
||||
const char * ROKEN_LIB_FUNCTION
|
||||
inet_ntop(int af, const void *src, char *dst, size_t size);
|
||||
#endif
|
||||
|
||||
#ifndef HAVE_INET_PTON
|
||||
#define inet_pton rk_inet_pton
|
||||
int ROKEN_LIB_FUNCTION
|
||||
inet_pton(int, const char *, void *);
|
||||
#endif
|
||||
|
||||
#if !defined(HAVE_GETCWD)
|
||||
#define getcwd rk_getcwd
|
||||
char* ROKEN_LIB_FUNCTION getcwd(char *, size_t);
|
||||
#endif
|
||||
|
||||
@@ -352,106 +297,83 @@ struct passwd * ROKEN_LIB_FUNCTION k_getpwuid (uid_t);
|
||||
const char * ROKEN_LIB_FUNCTION get_default_username (void);
|
||||
|
||||
#ifndef HAVE_SETEUID
|
||||
#define seteuid rk_seteuid
|
||||
int ROKEN_LIB_FUNCTION seteuid(uid_t);
|
||||
#endif
|
||||
|
||||
#ifndef HAVE_SETEGID
|
||||
#define setegid rk_setegid
|
||||
int ROKEN_LIB_FUNCTION setegid(gid_t);
|
||||
#endif
|
||||
|
||||
#ifndef HAVE_LSTAT
|
||||
#define lstat rk_lstat
|
||||
int ROKEN_LIB_FUNCTION lstat(const char *, struct stat *);
|
||||
#endif
|
||||
|
||||
#if !defined(HAVE_MKSTEMP) || defined(NEED_MKSTEMP_PROTO)
|
||||
#ifndef HAVE_MKSTEMP
|
||||
#define mkstemp rk_mkstemp
|
||||
#endif
|
||||
int ROKEN_LIB_FUNCTION mkstemp(char *);
|
||||
#endif
|
||||
|
||||
#ifndef HAVE_CGETENT
|
||||
#define cgetent rk_cgetent
|
||||
#define cgetstr rk_cgetstr
|
||||
int ROKEN_LIB_FUNCTION cgetent(char **, char **, const char *);
|
||||
int ROKEN_LIB_FUNCTION cgetstr(char *, const char *, char **);
|
||||
#endif
|
||||
|
||||
#ifndef HAVE_INITGROUPS
|
||||
#define initgroups rk_initgroups
|
||||
int ROKEN_LIB_FUNCTION initgroups(const char *, gid_t);
|
||||
#endif
|
||||
|
||||
#ifndef HAVE_FCHOWN
|
||||
#define fchown rk_fchown
|
||||
int ROKEN_LIB_FUNCTION fchown(int, uid_t, gid_t);
|
||||
#endif
|
||||
|
||||
#if !defined(HAVE_DAEMON) || defined(NEED_DAEMON_PROTO)
|
||||
#define daemon rk_daemon
|
||||
int ROKEN_LIB_FUNCTION daemon(int, int);
|
||||
#endif
|
||||
|
||||
#ifndef HAVE_INNETGR
|
||||
#define innetgr rk_innetgr
|
||||
int ROKEN_LIB_FUNCTION innetgr(const char *, const char *,
|
||||
const char *, const char *);
|
||||
#endif
|
||||
|
||||
#ifndef HAVE_CHOWN
|
||||
#define chown rk_chown
|
||||
int ROKEN_LIB_FUNCTION chown(const char *, uid_t, gid_t);
|
||||
#endif
|
||||
|
||||
#ifndef HAVE_RCMD
|
||||
#define rcmd rk_rcmd
|
||||
int ROKEN_LIB_FUNCTION
|
||||
rcmd(char **, unsigned short, const char *,
|
||||
const char *, const char *, int *);
|
||||
#endif
|
||||
|
||||
#if !defined(HAVE_INNETGR) || defined(NEED_INNETGR_PROTO)
|
||||
#define innetgr rk_innetgr
|
||||
int ROKEN_LIB_FUNCTION innetgr(const char*, const char*,
|
||||
const char*, const char*);
|
||||
#endif
|
||||
|
||||
#ifndef HAVE_IRUSEROK
|
||||
#define iruserok rk_iruserok
|
||||
int ROKEN_LIB_FUNCTION iruserok(unsigned, int,
|
||||
const char *, const char *);
|
||||
#endif
|
||||
|
||||
#if !defined(HAVE_GETHOSTNAME) || defined(NEED_GETHOSTNAME_PROTO)
|
||||
#ifndef HAVE_GETHOSTNAME
|
||||
#define gethostname
|
||||
#endif
|
||||
int ROKEN_LIB_FUNCTION gethostname(char *, int);
|
||||
#endif
|
||||
|
||||
#ifndef HAVE_WRITEV
|
||||
#define writev rk_writev
|
||||
ssize_t ROKEN_LIB_FUNCTION
|
||||
writev(int, const struct iovec *, int);
|
||||
#endif
|
||||
|
||||
#ifndef HAVE_READV
|
||||
#define readv rk_readv
|
||||
ssize_t ROKEN_LIB_FUNCTION
|
||||
readv(int, const struct iovec *, int);
|
||||
#endif
|
||||
|
||||
#ifndef HAVE_MKSTEMP
|
||||
#define mkstemp rk_mkstemp
|
||||
int ROKEN_LIB_FUNCTION
|
||||
mkstemp(char *);
|
||||
#endif
|
||||
|
||||
#ifndef HAVE_PIDFILE
|
||||
#define pidfile rk_pidfile
|
||||
void ROKEN_LIB_FUNCTION pidfile (const char*);
|
||||
#endif
|
||||
|
||||
@@ -477,11 +399,9 @@ unsigned short ROKEN_LIB_FUNCTION bswap16(unsigned short);
|
||||
#define LOCK_UN 8 /* Unlock */
|
||||
#endif
|
||||
|
||||
#define flock rk_flock
|
||||
int flock(int fd, int operation);
|
||||
#endif /* HAVE_FLOCK */
|
||||
|
||||
#define tm2time rk_tm2time
|
||||
time_t ROKEN_LIB_FUNCTION tm2time (struct tm, int);
|
||||
|
||||
int ROKEN_LIB_FUNCTION unix_verify_user(char *, char *);
|
||||
@@ -511,7 +431,6 @@ struct winsize {
|
||||
int ROKEN_LIB_FUNCTION get_window_size(int fd, struct winsize *);
|
||||
|
||||
#ifndef HAVE_VSYSLOG
|
||||
#define vsyslog rk_vsyslog
|
||||
void ROKEN_LIB_FUNCTION vsyslog(int, const char *, va_list);
|
||||
#endif
|
||||
|
||||
@@ -530,25 +449,21 @@ extern char **environ;
|
||||
#endif
|
||||
|
||||
#ifndef HAVE_GETIPNODEBYNAME
|
||||
#define getipnodebyname rk_getipnodebyname
|
||||
struct hostent * ROKEN_LIB_FUNCTION
|
||||
getipnodebyname (const char *, int, int, int *);
|
||||
#endif
|
||||
|
||||
#ifndef HAVE_GETIPNODEBYADDR
|
||||
#define getipnodebyaddr rk_getipnodebyaddr
|
||||
struct hostent * ROKEN_LIB_FUNCTION
|
||||
getipnodebyaddr (const void *, size_t, int, int *);
|
||||
#endif
|
||||
|
||||
#ifndef HAVE_FREEHOSTENT
|
||||
#define freehostent rk_freehostent
|
||||
void ROKEN_LIB_FUNCTION
|
||||
freehostent (struct hostent *);
|
||||
#endif
|
||||
|
||||
#ifndef HAVE_COPYHOSTENT
|
||||
#define copyhostent rk_copyhostent
|
||||
struct hostent * ROKEN_LIB_FUNCTION
|
||||
copyhostent (const struct hostent *);
|
||||
#endif
|
||||
@@ -616,7 +531,6 @@ struct addrinfo {
|
||||
#endif
|
||||
|
||||
#ifndef HAVE_GETADDRINFO
|
||||
#define getaddrinfo rk_getaddrinfo
|
||||
int ROKEN_LIB_FUNCTION
|
||||
getaddrinfo(const char *,
|
||||
const char *,
|
||||
@@ -625,7 +539,6 @@ getaddrinfo(const char *,
|
||||
#endif
|
||||
|
||||
#ifndef HAVE_GETNAMEINFO
|
||||
#define getnameinfo rk_getnameinfo
|
||||
int ROKEN_LIB_FUNCTION
|
||||
getnameinfo(const struct sockaddr *, socklen_t,
|
||||
char *, size_t,
|
||||
@@ -634,13 +547,11 @@ getnameinfo(const struct sockaddr *, socklen_t,
|
||||
#endif
|
||||
|
||||
#ifndef HAVE_FREEADDRINFO
|
||||
#define freeaddrinfo rk_freeaddrinfo
|
||||
void ROKEN_LIB_FUNCTION
|
||||
freeaddrinfo(struct addrinfo *);
|
||||
#endif
|
||||
|
||||
#ifndef HAVE_GAI_STRERROR
|
||||
#define gai_strerror rk_gai_strerror
|
||||
const char * ROKEN_LIB_FUNCTION
|
||||
gai_strerror(int);
|
||||
#endif
|
||||
@@ -657,31 +568,25 @@ int ROKEN_LIB_FUNCTION
|
||||
roken_getaddrinfo_hostspec2(const char *, int, int, struct addrinfo **);
|
||||
|
||||
#ifndef HAVE_STRFTIME
|
||||
#define strftime rk_strftime
|
||||
size_t ROKEN_LIB_FUNCTION
|
||||
strftime (char *, size_t, const char *, const struct tm *);
|
||||
#endif
|
||||
|
||||
#ifndef HAVE_STRPTIME
|
||||
#define strptime rk_strptime
|
||||
char * ROKEN_LIB_FUNCTION
|
||||
strptime (const char *, const char *, struct tm *);
|
||||
#endif
|
||||
|
||||
#ifndef HAVE_EMALLOC
|
||||
#define emalloc rk_emalloc
|
||||
void * ROKEN_LIB_FUNCTION emalloc (size_t);
|
||||
#endif
|
||||
#ifndef HAVE_ECALLOC
|
||||
#define ecalloc rk_ecalloc
|
||||
void * ROKEN_LIB_FUNCTION ecalloc(size_t, size_t);
|
||||
#endif
|
||||
#ifndef HAVE_EREALLOC
|
||||
#define erealloc rk_erealloc
|
||||
void * ROKEN_LIB_FUNCTION erealloc (void *, size_t);
|
||||
#endif
|
||||
#ifndef HAVE_ESTRDUP
|
||||
#define estrdup rk_estrdup
|
||||
char * ROKEN_LIB_FUNCTION estrdup (const char *);
|
||||
#endif
|
||||
|
||||
@@ -729,84 +634,61 @@ roken_gethostbyaddr(const void*, size_t, int);
|
||||
#endif
|
||||
|
||||
#ifndef HAVE_SETPROGNAME
|
||||
#define setprogname rk_setprogname
|
||||
void ROKEN_LIB_FUNCTION setprogname(const char *);
|
||||
#endif
|
||||
|
||||
#ifndef HAVE_GETPROGNAME
|
||||
#define getprogname rk_getprogname
|
||||
const char * ROKEN_LIB_FUNCTION getprogname(void);
|
||||
#endif
|
||||
|
||||
#define mini_inetd_addrinfo rk_mini_inetd_addrinfo
|
||||
#define mini_inetd rk_mini_inetd
|
||||
#if !defined(HAVE_SETPROGNAME) && !defined(HAVE_GETPROGNAME) && !HAVE_DECL___PROGNAME
|
||||
extern const char *__progname;
|
||||
#endif
|
||||
|
||||
void ROKEN_LIB_FUNCTION mini_inetd_addrinfo (struct addrinfo*);
|
||||
void ROKEN_LIB_FUNCTION mini_inetd (int);
|
||||
|
||||
#ifndef HAVE_LOCALTIME_R
|
||||
#define localtime_r rk_localtime_r
|
||||
struct tm * ROKEN_LIB_FUNCTION
|
||||
localtime_r(const time_t *, struct tm *);
|
||||
#endif
|
||||
|
||||
#if !defined(HAVE_STRSVIS) || defined(NEED_STRSVIS_PROTO)
|
||||
#ifndef HAVE_STRSVIS
|
||||
#define strsvis rk_strsvis
|
||||
#endif
|
||||
int ROKEN_LIB_FUNCTION
|
||||
strsvis(char *, const char *, int, const char *);
|
||||
#endif
|
||||
|
||||
#if !defined(HAVE_STRUNVIS) || defined(NEED_STRUNVIS_PROTO)
|
||||
#ifndef HAVE_STRUNVIS
|
||||
#define strunvis rk_strunvis
|
||||
#endif
|
||||
int ROKEN_LIB_FUNCTION
|
||||
strunvis(char *, const char *);
|
||||
#endif
|
||||
|
||||
#if !defined(HAVE_STRVIS) || defined(NEED_STRVIS_PROTO)
|
||||
#ifndef HAVE_STRVIS
|
||||
#define strvis rk_strvis
|
||||
#endif
|
||||
int ROKEN_LIB_FUNCTION
|
||||
strvis(char *, const char *, int);
|
||||
#endif
|
||||
|
||||
#if !defined(HAVE_STRVISX) || defined(NEED_STRVISX_PROTO)
|
||||
#ifndef HAVE_STRVISX
|
||||
#define strvisx rk_strvisx
|
||||
#endif
|
||||
int ROKEN_LIB_FUNCTION
|
||||
strvisx(char *, const char *, size_t, int);
|
||||
#endif
|
||||
|
||||
#if !defined(HAVE_SVIS) || defined(NEED_SVIS_PROTO)
|
||||
#ifndef HAVE_SVIS
|
||||
#define svis rk_svis
|
||||
#endif
|
||||
char * ROKEN_LIB_FUNCTION
|
||||
svis(char *, int, int, int, const char *);
|
||||
#endif
|
||||
|
||||
#if !defined(HAVE_UNVIS) || defined(NEED_UNVIS_PROTO)
|
||||
#ifndef HAVE_UNVIS
|
||||
#define unvis rk_unvis
|
||||
#endif
|
||||
int ROKEN_LIB_FUNCTION
|
||||
unvis(char *, int, int *, int);
|
||||
#endif
|
||||
|
||||
#if !defined(HAVE_VIS) || defined(NEED_VIS_PROTO)
|
||||
#ifndef HAVE_VIS
|
||||
#define vis rk_vis
|
||||
#endif
|
||||
char * ROKEN_LIB_FUNCTION
|
||||
vis(char *, int, int, int);
|
||||
#endif
|
||||
|
||||
#if !defined(HAVE_CLOSEFROM)
|
||||
#define closefrom rk_closefrom
|
||||
int ROKEN_LIB_FUNCTION
|
||||
closefrom(int);
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user