Skip to content

Commit fea2b1c

Browse files
mflattmflatt
committed
repairs for MinGW build
Fix compiler warnings and installation bugs related to the ".exe" extension.
1 parent a3e359d commit fea2b1c

File tree

9 files changed

+28
-25
lines changed

9 files changed

+28
-25
lines changed

‎racket/collects/compiler/private/xform.rkt‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3997,8 +3997,6 @@
39973997
;; Not a decl
39983998
(values (reverse decls) el))))))
39993999

4000-
(define braces-then-semi '(typedef struct union enum __extension__))
4001-
40024000
(define (get-one e comma-sep?)
40034001
(let loop ([e e][result null][first #f][second #f])
40044002
(cond
@@ -4018,7 +4016,7 @@
40184016
[(and (eq? '|,| (tok-n (car e))) comma-sep?)
40194017
(values (reverse (cons (car e) result)) (cdr e))]
40204018
[(and (braces? (car e))
4021-
(not (memq first '(typedef enum __extension__)))
4019+
(not (memq first '(typedef enum)))
40224020
(or (not (memq first '(static extern const struct union)))
40234021
(equal? second "C") ; => extern "C" ...
40244022
(equal? second "C++") ; => extern "C++" ...
@@ -4030,7 +4028,10 @@
40304028
(values (reverse (cons (car e) result)) rest)
40314029
(values (reverse (list* (car rest) (car e) result)) (cdr rest))))]
40324030
[else (loop (cdr e) (cons (car e) result)
4033-
(or first (tok-n (car e)))
4031+
(or first (let ([s (tok-n (car e))])
4032+
(if (memq s '(__extension__))
4033+
#f ; skip over annotation when deciding shape
4034+
s)))
40344035
(or second (and first (tok-n (car e)))))])))
40354036

40364037
(define (foldl-statement e comma-sep? f a-init)

‎racket/src/gracket/Makefile.in‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ install-lib-cgc-wx_xt:
204204

205205
install-wx_xt-cgc:
206206
$(MAKE) @MRLIBINSTALL@-cgc-wx_xt
207-
cd ..; $(ICP) gracket/gracket@CGC@ "$(DESTDIR)$(libpltdir)/gracket@CGC_INSTALLED@"
207+
cd ..; $(ICP) gracket/gracket@CGC@ "$(DESTDIR)$(libpltdir)/gracket@CGC_INSTALLED@@EXE_SUFFIX@"
208208
cd ..; @STRIP_DEBUG@ "$(DESTDIR)$(libpltdir)/gracket@CGC_INSTALLED@@EXE_SUFFIX@"
209209
@RUN_RACKET_CGC@ $(SELF_RACKET_FLAGS) -cu "$(srcdir)/../racket/collects-path.rkt" @DIRCVTPRE@"$(DESTDIR)$(libpltdir)/gracket@CGC_INSTALLED@@EXE_SUFFIX@"@DIRCVTPOST@ @COLLECTS_PATH@ @CONFIG_PATH@
210210

@@ -219,7 +219,7 @@ install-lib-3m-wx_xt:
219219

220220
install-wx_xt-3m:
221221
$(MAKE) @MRLIBINSTALL@-3m-wx_xt
222-
cd ..; $(ICP) gracket/gracket@MMM@ "$(DESTDIR)$(libpltdir)/gracket@MMM_INSTALLED@"
222+
cd ..; $(ICP) gracket/gracket@MMM@ "$(DESTDIR)$(libpltdir)/gracket@MMM_INSTALLED@@EXE_SUFFIX@"
223223
cd ..; @STRIP_DEBUG@ "$(DESTDIR)$(libpltdir)/gracket@MMM_INSTALLED@@EXE_SUFFIX@"
224224
@RUN_RACKET_MMM@ $(SELF_RACKET_FLAGS) -cu "$(srcdir)/../racket/collects-path.rkt" @DIRCVTPRE@"$(DESTDIR)$(libpltdir)/gracket@MMM_INSTALLED@@EXE_SUFFIX@"@DIRCVTPOST@ @COLLECTS_PATH@ @CONFIG_PATH@
225225

‎racket/src/gracket/grmain.c‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,9 @@ static void pre_filter_cmdline_arguments(int *argc, char ***argv);
5252

5353
#if WIN32
5454
# define DLL_RELATIVE_PATH L"."
55-
# define INITIAL_COLLECTS_DIRECTORY "../collects"
55+
# ifndef INITIAL_COLLECTS_DIRECTORY
56+
# define INITIAL_COLLECTS_DIRECTORY "../collects"
57+
# endif
5658
#endif
5759

5860
#ifndef INITIAL_CONFIG_DIRECTORY
@@ -113,7 +115,7 @@ static void init_console_in()
113115
if (!console_in) {
114116
console_in = GetStdHandle(STD_INPUT_HANDLE);
115117
MZ_REGISTER_STATIC(console_inport);
116-
console_inport = scheme_make_fd_input_port((int)console_in, scheme_intern_symbol("stdin"), 0, 0);
118+
console_inport = scheme_make_fd_input_port((intptr_t)console_in, scheme_intern_symbol("stdin"), 0, 0);
117119
}
118120
}
119121

‎racket/src/racket/Makefile.in‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -405,14 +405,14 @@ mingw-install:
405405
mingw-install-cgc:
406406
cd ..; $(ICP) racket/lib/libmzgcxxxxxxx.dll "$(DESTDIR)$(libdir)/libmzgcxxxxxxx.dll"
407407
cd ..; $(ICP) racket/lib/libracketxxxxxxx.dll "$(DESTDIR)$(libdir)/libracketxxxxxxx.dll"
408-
cd ..; $(ICP) racket/racket@CGC@ "$(DESTDIR)@MZINSTALLBINDIR@/Racket@CGC_INSTALLED@"
408+
cd ..; $(ICP) racket/racket@CGC@ "$(DESTDIR)@MZINSTALLBINDIR@/Racket@CGC_INSTALLED@@EXE_SUFFIX@"
409409
@RUN_RACKET_CGC@ -cu "$(srcdir)/collects-path.rkt" @DIRCVTPRE@"$(DESTDIR)@MZINSTALLBINDIR@/Racket@CGC_INSTALLED@@EXE_SUFFIX@"@DIRCVTPOST@ $(DESTDIR)@COLLECTS_PATH@ $(DESTDIR)@CONFIG_PATH@
410410

411411
mingw-install-cgc-final:
412412
$(NOOP)
413413

414414
mingw-install-3m:
415-
cd ..; $(ICP) racket/racket@MMM@ "$(DESTDIR)@MZINSTALLBINDIR@/Racket@MMM_INSTALLED@"
415+
cd ..; $(ICP) racket/racket@MMM@ "$(DESTDIR)@MZINSTALLBINDIR@/Racket@MMM_INSTALLED@@EXE_SUFFIX@"
416416
cd ..; $(ICP) racket/lib/libracket3mxxxxxxx.dll "$(DESTDIR)$(libdir)/libracket3mxxxxxxx.dll"
417417
@RUN_RACKET_MMM@ -cu "$(srcdir)/collects-path.rkt" @DIRCVTPRE@"$(DESTDIR)@MZINSTALLBINDIR@/Racket@MMM_INSTALLED@@EXE_SUFFIX@"@DIRCVTPOST@ $(DESTDIR)@COLLECTS_PATH@ $(DESTDIR)@CONFIG_PATH@
418418

‎racket/src/racket/dynsrc/Makefile.in‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ ALL_CFLAGS = $(CFLAGS) $(CPPFLAGS) -I$(builddir)/.. -I$(srcdir)/../include -I$(s
2525

2626
dynlib:
2727
$(MAKE) ../mzdyn.o
28-
$(MAKE) ../starter
28+
$(MAKE) ../starter@EXE_SUFFIX@
2929

3030
dynlib3m:
3131
$(MAKE) ../mzdyn3m.o
@@ -53,12 +53,12 @@ dynexmpl.o: $(srcdir)/dynexmpl.c $(HEADERS)
5353
$(PLAIN_CC) $(ALL_CFLAGS) -c $(srcdir)/dynexmpl.c -o dynexmpl.o
5454

5555
../starter@NOT_MINGW@@EXE_SUFFIX@: $(srcdir)/ustart.c
56-
$(PLAIN_CC) $(ALL_CFLAGS) -o ../starter $(srcdir)/ustart.c
56+
$(PLAIN_CC) $(ALL_CFLAGS) -o ../starter@EXE_SUFFIX@ $(srcdir)/ustart.c
5757

5858
../starter@MINGW@@EXE_SUFFIX@: $(srcdir)/start.c ../mrstarter@EXE_SUFFIX@ sres.o
59-
$(PLAIN_CC) $(ALL_CFLAGS) -o ../starter $(srcdir)/start.c sres.o
59+
$(PLAIN_CC) $(ALL_CFLAGS) -o ../starter@EXE_SUFFIX@ $(srcdir)/start.c sres.o
6060
../mrstarter@EXE_SUFFIX@: sres.o
61-
$(PLAIN_CC) $(ALL_CFLAGS) -mwindows -DMRSTART -o ../mrstarter $(srcdir)/start.c sres.o
61+
$(PLAIN_CC) $(ALL_CFLAGS) -mwindows -DMRSTART -o ../mrstarter@EXE_SUFFIX@ $(srcdir)/start.c sres.o
6262

6363
sres.o:
6464
@WINDRES@ -i $(srcdir)/../../worksp/starters/start.rc -o sres.o

‎racket/src/racket/dynsrc/start.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,7 @@ int wmain(int argc_in, wchar_t **argv_in)
320320
if (_wstat(go, &st)) {
321321
#ifdef USE_WINMAIN
322322
wchar_t errbuff[MAXCOMMANDLEN * 2];
323-
swprintf(errbuff,L"Can't find %s",go);
323+
swprintf(errbuff,sizeof(errbuff),L"Can't find %s",go);
324324
MessageBoxW(NULL,errbuff,L"Error",MB_OK);
325325
#else
326326
char errbuff[MAXCOMMANDLEN * 2];
@@ -367,7 +367,7 @@ int wmain(int argc_in, wchar_t **argv_in)
367367
if (cl_len > MAXCOMMANDLEN) {
368368
#ifdef MRSTART
369369
wchar_t errbuff[MAXCOMMANDLEN * 2];
370-
swprintf(errbuff,L"Command line of %d characters exceeds %d characters: %.1024s",
370+
swprintf(errbuff,sizeof(errbuff),L"Command line of %d characters exceeds %d characters: %.1024s",
371371
cl_len, MAXCOMMANDLEN,command_line);
372372
MessageBoxW(NULL,errbuff,L"Error",MB_OK);
373373
#else

‎racket/src/racket/include/scheme.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1906,8 +1906,8 @@ MZ_EXTERN void scheme_register_embedded_load(intptr_t len, const char *s);
19061906
typedef void (*Scheme_Exit_Proc)(int v);
19071907
MZ_EXTERN Scheme_Exit_Proc scheme_exit;
19081908
MZ_EXTERN void scheme_set_exit(Scheme_Exit_Proc p);
1909-
typedef void (*Scheme_At_Exit_Callback_Proc)();
1910-
typedef void (*Scheme_At_Exit_Proc)(Scheme_At_Exit_Callback_Proc);
1909+
typedef void (*Scheme_At_Exit_Callback_Proc)(void);
1910+
typedef int (*Scheme_At_Exit_Proc)(Scheme_At_Exit_Callback_Proc);
19111911
MZ_EXTERN void scheme_set_atexit(Scheme_At_Exit_Proc p);
19121912
typedef void (*scheme_console_printf_t)(char *str, ...);
19131913
MZ_EXTERN scheme_console_printf_t scheme_console_printf;

‎racket/src/racket/src/file.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2411,9 +2411,9 @@ Scheme_Object *combine_link_path(char *copy, int len, char *clink, int clen,
24112411
# define MZ_UNC_WRITE 0x2
24122412
# define MZ_UNC_EXEC 0x4
24132413

2414-
static int UNC_stat(char *dirname, int len, int *flags, int *isdir, int *islink,
2414+
static int UNC_stat(const char *dirname, int len, int *flags, int *isdir, int *islink,
24152415
Scheme_Object **date, mzlonglong *filesize,
2416-
char **resolved_path, int set_flags)
2416+
const char **resolved_path, int set_flags)
24172417
/* dirname must be absolute */
24182418
{
24192419
/* Note: stat() doesn't work with UNC "drive" names or \\?\ paths.
@@ -4179,7 +4179,7 @@ static char *filename_for_error(Scheme_Object *p)
41794179
}
41804180

41814181
#ifdef DOS_FILE_SYSTEM
4182-
static int enable_write_permission(char *fn)
4182+
static int enable_write_permission(const char *fn)
41834183
{
41844184
int len;
41854185
int flags;
@@ -5407,10 +5407,10 @@ static Scheme_Object *do_directory_list(int break_ok, int argc, Scheme_Object *a
54075407
err_val = GetLastError();
54085408
if ((err_val == ERROR_DIRECTORY) && CreateSymbolicLinkProc) {
54095409
/* check for symbolic link */
5410-
char *resolved;
5410+
const char *resolved;
54115411
if (UNC_stat(filename, strlen(filename), NULL, NULL, NULL, NULL, NULL, &resolved, -1)) {
54125412
if (resolved) {
5413-
filename = resolved;
5413+
filename = (char *)resolved;
54145414
goto retry;
54155415
}
54165416
}

‎racket/src/racket/src/mzrt.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -178,9 +178,9 @@ void *mzrt_thread_stub(void *data){
178178
}
179179

180180
#ifdef WIN32
181-
DWORD WINAPI mzrt_win_thread_stub(void *data)
181+
uintptr_t WINAPI mzrt_win_thread_stub(void *data)
182182
{
183-
return (DWORD)mzrt_thread_stub(data);
183+
return (uintptr_t)mzrt_thread_stub(data);
184184
}
185185
#endif
186186

0 commit comments

Comments
 (0)