Skip to content

Commit ba4cae1

Browse files
committed
Fix a few compile errors in more recent mingw32 build
1 parent edadddb commit ba4cae1

File tree

4 files changed

+5
-8
lines changed

4 files changed

+5
-8
lines changed

make.def

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
# Ubuntu
1515
#TOOLPATH=/usr/bin/
16-
#CROSS=$(TOOLPATH)/i586-mingw32msvc-
16+
#CROSS=$(TOOLPATH)/i686-w64-mingw32-
1717

1818
# OpenBSD
1919
#TOOLPATH=/usr/local/mingw32/bin/

pib/psout.c

-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@
6565

6666
#include "../tools/getoptv.h"
6767
#include "../tools/number.h"
68-
#include "../tools/chars.h"
6968
#include "../tools/types.h"
7069
#include "../tools/error.h"
7170
#include "../tools/files.h"

tools/chars.h

-6
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,6 @@
1515
*
1616
*--------------------------------------------------------------------*/
1717

18-
#ifndef isblank
19-
#ifndef __CYGWIN__
20-
#define isblank(c) ((char)(c) == ' ') || ((char)(c) == '\t')
21-
#endif
22-
#endif
23-
2418
#ifndef nobreak
2519
#define nobreak(c) ((char)(c) != '\n') && ((int)(c) != EOF)
2620
#endif

tools/files.h

+4
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,12 @@
6262

6363
#ifdef WIN32
6464
#define FILE_FILEMODE S_IREAD|S_IWRITE
65+
#ifndef S_IRGRP
6566
#define S_IRGRP 0
67+
#endif
68+
#ifndef S_IROTH
6669
#define S_IROTH 0
70+
#endif
6771
#else
6872
#define FILE_FILEMODE S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH
6973
#define O_BINARY 0

0 commit comments

Comments
 (0)