Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix issues #3005 and #3009. #3011

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion deps/libuv
2 changes: 1 addition & 1 deletion src/flisp/flisp.c
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
#else
#include <math.h>
#endif
#if defined(_OS_WINDOWS_)
#if defined(_OS_WINDOWS_) && !defined(_COMPILER_MINGW_)
char * basename(char *);
char * dirname(char *);
#else
Expand Down
8 changes: 8 additions & 0 deletions src/support/dtypes.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,12 @@

#if defined(_OS_WINDOWS_)

#include <stdio.h>
#include <stdlib.h>
#include <sys/stat.h>

#if !defined(_COMPILER_MINGW_)

#define strtoull _strtoui64
#define strtoll _strtoi64
#define strcasecmp _stricmp
Expand All @@ -22,6 +28,8 @@
#define STDOUT_FILENO 1
#define STDERR_FILENO 2

#endif /* !_COMPILER_MINGW_ */

#if defined(_COMPILER_MICROSOFT_)
#define isnan _isnan
#endif /* _COMPILER_MICROSOFT_ */
Expand Down
4 changes: 2 additions & 2 deletions src/support/ios.c
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
#if defined(__APPLE__) || defined(_OS_WINDOWS_)
void *memrchr(const void *s, int c, size_t n)
{
const unsigned char *src = (char *)s + n;
const unsigned char *src = (unsigned char *)s + n;
unsigned char uc = c;
while (--src >= (unsigned char *) s)
if (*src == uc)
Expand Down Expand Up @@ -527,7 +527,7 @@ int ios_trunc(ios_t *s, size_t size)
#if !defined(_OS_WINDOWS_)
if (ftruncate(s->fd, size) == 0)
#else
if (_chsize_s(s->fd, size) == 0)
if (_chsize(s->fd, size) == 0)
#endif
return 0;
}
Expand Down