diff options
Diffstat (limited to 'openbsd-compat/openbsd-compat.h')
-rw-r--r-- | openbsd-compat/openbsd-compat.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/openbsd-compat/openbsd-compat.h b/openbsd-compat/openbsd-compat.h index 865aaee53..fda6706f8 100644 --- a/openbsd-compat/openbsd-compat.h +++ b/openbsd-compat/openbsd-compat.h | |||
@@ -73,6 +73,10 @@ int getpagesize(void); | |||
73 | char *getcwd(char *pt, size_t size); | 73 | char *getcwd(char *pt, size_t size); |
74 | #endif | 74 | #endif |
75 | 75 | ||
76 | #ifdef HAVE_MEMMEM | ||
77 | void *memmem(const void *, size_t, const void *, size_t); | ||
78 | #endif | ||
79 | |||
76 | #ifndef HAVE_REALLOCARRAY | 80 | #ifndef HAVE_REALLOCARRAY |
77 | void *reallocarray(void *, size_t, size_t); | 81 | void *reallocarray(void *, size_t, size_t); |
78 | #endif | 82 | #endif |
@@ -81,18 +85,6 @@ void *reallocarray(void *, size_t, size_t); | |||
81 | void *recallocarray(void *, size_t, size_t, size_t); | 85 | void *recallocarray(void *, size_t, size_t, size_t); |
82 | #endif | 86 | #endif |
83 | 87 | ||
84 | #if !defined(HAVE_REALPATH) || defined(BROKEN_REALPATH) | ||
85 | /* | ||
86 | * glibc's FORTIFY_SOURCE can redefine this and prevent us picking up the | ||
87 | * compat version. | ||
88 | */ | ||
89 | # ifdef BROKEN_REALPATH | ||
90 | # define realpath(x, y) _ssh_compat_realpath(x, y) | ||
91 | # endif | ||
92 | |||
93 | char *realpath(const char *path, char *resolved); | ||
94 | #endif | ||
95 | |||
96 | #ifndef HAVE_RRESVPORT_AF | 88 | #ifndef HAVE_RRESVPORT_AF |
97 | int rresvport_af(int *alport, sa_family_t af); | 89 | int rresvport_af(int *alport, sa_family_t af); |
98 | #endif | 90 | #endif |
@@ -109,6 +101,14 @@ size_t strlcat(char *dst, const char *src, size_t siz); | |||
109 | char *strcasestr(const char *, const char *); | 101 | char *strcasestr(const char *, const char *); |
110 | #endif | 102 | #endif |
111 | 103 | ||
104 | #ifndef HAVE_STRNLEN | ||
105 | size_t strnlen(const char *, size_t); | ||
106 | #endif | ||
107 | |||
108 | #ifndef HAVE_STRNDUP | ||
109 | char *strndup(const char *s, size_t n); | ||
110 | #endif | ||
111 | |||
112 | #ifndef HAVE_SETENV | 112 | #ifndef HAVE_SETENV |
113 | int setenv(register const char *name, register const char *value, int rewrite); | 113 | int setenv(register const char *name, register const char *value, int rewrite); |
114 | #endif | 114 | #endif |