Skip to content

Commit 89cec98

Browse files
authored
fix duplicate symbols from posix_compat, openbsd_compat with libcrypto (#593)
1 parent 9598cec commit 89cec98

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

contrib/win32/openssh/config.h.vs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -206,13 +206,13 @@
206206
/* #undef HAVE_ADDR_V6_IN_UTMPX */
207207

208208
/* Define to 1 if you have the `arc4random' function. */
209-
/* #undef HAVE_ARC4RANDOM */
209+
#define HAVE_ARC4RANDOM 1
210210

211211
/* Define to 1 if you have the `arc4random_buf' function. */
212-
/* #undef HAVE_ARC4RANDOM_BUF */
212+
#define HAVE_ARC4RANDOM_BUF 1
213213

214214
/* Define to 1 if you have the `arc4random_uniform' function. */
215-
/* #undef HAVE_ARC4RANDOM_UNIFORM */
215+
#define HAVE_ARC4RANDOM_UNIFORM 1
216216

217217
/* Define to 1 if you have the `asprintf' function. */
218218
/* #undef HAVE_ASPRINTF */

contrib/win32/win32compat/misc.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ nanosleep(const struct timespec *req, struct timespec *rem)
190190
* Copyright (c) 2009, 2010 NoMachine
191191
* All rights reserved
192192
*/
193-
int
193+
static int
194194
gettimeofday(struct timeval *tv, void *tz)
195195
{
196196
union {
@@ -212,7 +212,7 @@ gettimeofday(struct timeval *tv, void *tz)
212212
return 0;
213213
}
214214

215-
void
215+
static void
216216
explicit_bzero(void *b, size_t len)
217217
{
218218
SecureZeroMemory(b, len);
@@ -1480,7 +1480,7 @@ localtime_r(const time_t *timep, struct tm *result)
14801480
return localtime_s(result, timep) == 0 ? result : NULL;
14811481
}
14821482

1483-
void
1483+
static void
14841484
freezero(void *ptr, size_t sz)
14851485
{
14861486
if (ptr == NULL)

0 commit comments

Comments
 (0)