Attachment #49585 for issue #83540

View | Details | Raw Unified | Return to issue 83540
Collapse All | Expand All

Lines 28-37 Link Here

(-)dmake/dag.c (-4 lines)
28		28
29	#include "extern.h"	29	#include "extern.h"
30		30
31	#if defined(USE_CREATEPROCESS)
32	#include <windows.h>
33	#endif
34
35		31
36	static void	32	static void
37	set_macro_value(hp)/*	33	set_macro_value(hp)/*

Lines 29-34 Link Here

(-)dmake/extern.h (+6 lines)
29	#ifndef EXTERN_h	29	#ifndef EXTERN_h
30	#define EXTERN_h	30	#define EXTERN_h
31		31
		32	/* For MSVC++ needs to include windows.h first to avoid problems with
		33	* type redefinitions. Include it also for MinGW for consistency. */
		34	#if defined(__MINGW32__) \|\| defined(_MSC_VER)
		35	#include <windows.h>
		36	#endif
		37
32	#include "config.h"	38	#include "config.h"
33		39
34	/* Define this for the RS/6000 if it breaks something then we have to put a	40	/* Define this for the RS/6000 if it breaks something then we have to put a

Lines 28-37 Link Here

(-)dmake/imacs.c (-4 lines)
28		28
29	#include "extern.h"	29	#include "extern.h"
30		30
31	#if defined(USE_CREATEPROCESS)
32	#include <windows.h>
33	#endif
34
35	static void _set_int_var ANSI((char , char , int, int *));	31	static void _set_int_var ANSI((char , char , int, int *));
36	static void _set_string_var ANSI((char , char , int, char **));	32	static void _set_string_var ANSI((char , char , int, char **));
37	static void _set_bit_var ANSI((char , char , int));	33	static void _set_bit_var ANSI((char , char , int));

Lines 61-70 Link Here

(-)dmake/sysintf.c (-2 / +1 lines)
61		61
62	#include "extern.h"	62	#include "extern.h"
63		63
64	/* The following include file is only needed for GetModuleFileName() */	64	/* The following definition controls the use of GetModuleFileName() */
65	#if defined(_MSC_VER) \|\| defined(__MINGW32__)	65	#if defined(_MSC_VER) \|\| defined(__MINGW32__)
66	# define HAVE_GETMODULEFILENAMEFUNC 1	66	# define HAVE_GETMODULEFILENAMEFUNC 1
67	# include <windows.h>
68		67
69	/* this is needed for the _ftime call below. Only needed here. */	68	/* this is needed for the _ftime call below. Only needed here. */
70	# include <sys/timeb.h>	69	# include <sys/timeb.h>

Lines 112-121 Link Here

(-)dmake/unix/runargv.c (-4 lines)
112		112
113	#include "extern.h"	113	#include "extern.h"
114		114
115	#if defined(USE_CREATEPROCESS)
116	#include <windows.h>
117	#endif
118
119	#ifdef HAVE_WAIT_H	115	#ifdef HAVE_WAIT_H
120	# include <wait.h>	116	# include <wait.h>
121	#else	117	#else





# The following sources are required for MSC
OSR_SRC += ruletab.c
DOS_SRC += rmprq.c
UNX_SRC += runargv.c

.SETDIR=$(osrdir) : $(OSR_SRC)
.SETDIR=msdos     : $(DOS_SRC)
.SETDIR=unix      : $(UNX_SRC)

SRC += $(OSR_SRC) $(DOS_SRC)
.SOURCE.h : $(osrdir)

Lines 31-39 Link Here

(-)dmake/win95/microsft/ruletab.c (-3 lines)
31		31
32	#include "extern.h"	32	#include "extern.h"
33		33
34	#if defined(USE_CREATEPROCESS)
35	#include <windows.h>
36	#endif
37	#if !defined(MAXIMUM_WAIT_OBJECTS)	34	#if !defined(MAXIMUM_WAIT_OBJECTS)
38	#define MAXIMUM_WAIT_OBJECTS 1	35	#define MAXIMUM_WAIT_OBJECTS 1
39	#endif	36	#endif

Lines 31-37 Link Here

(-)dmake/win95/microsft/vpp40/mk.bat (-1 / +1 lines)
31	rem Not needed for MSVC 6 and up. Lesser versions not supported	31	rem Not needed for MSVC 6 and up. Lesser versions not supported
32	rem cl -c %c_flg% -I. -Iwin95 -Iwin95\microsft -Iwin95\microsft\vpp40 /nologo -Od -GF -Ge -Foobjects\tempnam.obj tempnam.c	32	rem cl -c %c_flg% -I. -Iwin95 -Iwin95\microsft -Iwin95\microsft\vpp40 /nologo -Od -GF -Ge -Foobjects\tempnam.obj tempnam.c
33	cl -c %c_flg% -I. -Iwin95 -Iwin95\microsft -Iwin95\microsft\vpp40 /nologo -Od -GF -Ge -Foobjects\ruletab.obj win95\microsft\ruletab.c	33	cl -c %c_flg% -I. -Iwin95 -Iwin95\microsft -Iwin95\microsft\vpp40 /nologo -Od -GF -Ge -Foobjects\ruletab.obj win95\microsft\ruletab.c
34	cl -c %c_flg% -I. -Iwin95 -Iwin95\microsft -Iwin95\microsft\vpp40 /nologo -Od -GF -Ge -Foobjects\runargv.obj msdos\runargv.c	34	cl -c %c_flg% -I. -Iwin95 -Iwin95\microsft -Iwin95\microsft\vpp40 /nologo -Od -GF -Ge -Foobjects\runargv.obj unix\runargv.c
35	cl -c %c_flg% -I. -Iwin95 -Iwin95\microsft -Iwin95\microsft\vpp40 /nologo -Od -GF -Ge -Foobjects\rmprq.obj msdos\rmprq.c	35	cl -c %c_flg% -I. -Iwin95 -Iwin95\microsft -Iwin95\microsft\vpp40 /nologo -Od -GF -Ge -Foobjects\rmprq.obj msdos\rmprq.c
36		36
37	:link	37	:link

Return to issue 83540

Lines 15-24 Link Here

(-)dmake/win95/microsft/config.mk (-1 / +3 lines)
15		15
16	# The following sources are required for MSC	16	# The following sources are required for MSC
17	OSR_SRC += ruletab.c	17	OSR_SRC += ruletab.c
18	DOS_SRC += runargv.c rmprq.c	18	DOS_SRC += rmprq.c
		19	UNX_SRC += runargv.c
19		20
20	.SETDIR=$(osrdir) : $(OSR_SRC)	21	.SETDIR=$(osrdir) : $(OSR_SRC)
21	.SETDIR=msdos : $(DOS_SRC)	22	.SETDIR=msdos : $(DOS_SRC)
		23	.SETDIR=unix : $(UNX_SRC)
22		24
23	SRC += $(OSR_SRC) $(DOS_SRC)	25	SRC += $(OSR_SRC) $(DOS_SRC)
24	.SOURCE.h : $(osrdir)	26	.SOURCE.h : $(osrdir)