Attachment #4668 for issue #11319

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

Lines 13-18 Link Here

(-)dmake/tempnam.c (-2 / +6 lines)
13	#endif	13	#endif
14		14
15	#define DirEntryKind int	15	#define DirEntryKind int
		16	/* The MSVC 6 default is only 260 */
		17	#ifdef _MAX_PATH
		18	#undef _MAX_PATH
		19	#endif
16	#define _MAX_PATH 1024	20	#define _MAX_PATH 1024
17	#define WNT	21	#define WNT
18		22
Lines 68-74 Link Here
68	/* ret_val = new char[i+2 /* '\0' & '\\' // + 8 /root//* + 4 /.ext//];/	72	/* ret_val = new char[i+2 /* '\0' & '\\' // + 8 /root//* + 4 /.ext//];/
69	if (ret_val)	73	if (ret_val)
70	{	74	{
71	strncpy(ret_val,dir, sizeof(retval)-1);	75	strncpy(ret_val,dir, sizeof(ret_val)-1);
72		76
73	/* Make sure directory ends with a separator */	77	/* Make sure directory ends with a separator */
74	#if defined(DOS) \|\| defined(PM2) \|\| defined(WIN) \|\| defined(WNT)	78	#if defined(DOS) \|\| defined(PM2) \|\| defined(WIN) \|\| defined(WNT)
Lines 105-111 Link Here
105	#if defined(OS2) \|\| defined(WIN) \|\| defined(WNT) \|\| defined(DOS)	109	#if defined(OS2) \|\| defined(WIN) \|\| defined(WNT) \|\| defined(DOS)
106	itoa(nTemp,ret_val + i,26);	110	itoa(nTemp,ret_val + i,26);
107	#else	111	#else
108	snprintf(ret_val+i, sizeof(retval) + i, "%03u", nTemp);	112	snprintf(ret_val+i, sizeof(ret_val) + i, "%03u", nTemp);
109	#endif	113	#endif
110	strcat(ret_val,ext);	114	strcat(ret_val,ext);
111	nhandle = _open( ret_val, _O_CREAT \| _O_EXCL, _S_IWRITE \| _S_IREAD );	115	nhandle = _open( ret_val, _O_CREAT \| _O_EXCL, _S_IWRITE \| _S_IREAD );




*/

#include <signal.h>
#if !defined(__APPLE__) && !defined(_MSC_VER)
#include <wait.h>
#endif

#include "extern.h"

/*  temporarily comment out spawn code as it does not actually work yet */
#undef HAVE_SPAWN_H
#if HAVE_SPAWN_H
#  include <spawn.h>

Lines 109-115 Link Here

(-)dmake/unix/cygwin/public.h (-1 / +1 lines)
109	int Test_circle ANSI((CELLPTR, int));	109	int Test_circle ANSI((CELLPTR, int));
110	STRINGPTR Def_recipe ANSI((char *, STRINGPTR, int, int));	110	STRINGPTR Def_recipe ANSI((char *, STRINGPTR, int, int));
111	t_attr Rcp_attribute ANSI((char *));	111	t_attr Rcp_attribute ANSI((char *));
112	void main ANSI((int, char **));	112	int main ANSI((int, char **));
113	FILE Openfile ANSI((char , int, int));	113	FILE Openfile ANSI((char , int, int));
114	FILE *Closefile ANSI(());	114	FILE *Closefile ANSI(());
115	FILE Search_file ANSI((char , char **));	115	FILE Search_file ANSI((char , char **));

Lines 85-90 Link Here

(-)dmake/win95/microsft/config.h (-1 / +12 lines)
85	-- Use cvs log to obtain detailed change logs.	85	-- Use cvs log to obtain detailed change logs.
86	*/	86	*/
87		87
		88	/* Attention! In the UNIX like builds with the ./configure ; make
		89	procedure a config.h is generated. The autogenerated config.h
		90	must not be there to compile dmake with MSC and the
		91	"dmake\make.bat win95-vpp40" command. This file sets (among other
		92	things) the needed HAS_... and HAVE_... macros.
		93	*/
		94
88	#if defined (_MSC_VER)	95	#if defined (_MSC_VER)
89	# if _MSC_VER < 500	96	# if _MSC_VER < 500
90	Force a compile-time blowup.	97	Force a compile-time blowup.
Lines 130-136 Link Here
130	/* MSC has sys/types.h and sys/stat.h (this is tested only with MSVC++ 6.0) */	137	/* MSC has sys/types.h and sys/stat.h (this is tested only with MSVC++ 6.0) */
131	#define HAVE_SYS_TYPES_H 1	138	#define HAVE_SYS_TYPES_H 1
132	#define HAVE_SYS_STAT_H 1	139	#define HAVE_SYS_STAT_H 1
133		140
		141	/* These functions are available! (this is tested only with MSVC++ 6.0) */
		142	#define HAVE_GETCWD 1
		143	#define HAVE_UTIME_NULL 1
		144	#define HAVE_TZSET 1
134		145
135	#ifndef MSDOS	146	#ifndef MSDOS
136	# define MSDOS 1	147	# define MSDOS 1

Lines 39-44 Link Here

(-)dmake/win95/microsft/ruletab.c (+3 lines)
39	".MAKEFILES : makefile.mk makefile",	39	".MAKEFILES : makefile.mk makefile",
40	".SOURCE : .NULL",	40	".SOURCE : .NULL",
41	#include "startup.h"	41	#include "startup.h"
		42	#if __MINGW32__
		43	# include "dmakeroot.h"
		44	#endif
42	(char *)NULL };	45	(char *)NULL };
43		46
44	char *Rule_tab = _rules; / for sundry reasons in Get_environment() */	47	char *Rule_tab = _rules; / for sundry reasons in Get_environment() */

Lines 88-94 Link Here

(-)dmake/win95/microsft/vpp40/public.h (-1 / +1 lines)
88	int Test_circle ANSI((CELLPTR, int));	88	int Test_circle ANSI((CELLPTR, int));
89	STRINGPTR Def_recipe ANSI((char *, STRINGPTR, int, int));	89	STRINGPTR Def_recipe ANSI((char *, STRINGPTR, int, int));
90	t_attr Rcp_attribute ANSI((char *));	90	t_attr Rcp_attribute ANSI((char *));
91	void main ANSI((int, char **));	91	int main ANSI((int, char **));
92	FILE Openfile ANSI((char , int, int));	92	FILE Openfile ANSI((char , int, int));
93	FILE *Closefile ANSI(());	93	FILE *Closefile ANSI(());
94	FILE Search_file ANSI((char , char **));	94	FILE Search_file ANSI((char , char **));

Return to issue 11319

Lines 84-96 Link Here

(-)dmake/unix/runargv.c (-2 / +2 lines)
84	*/	84	*/
85		85
86	#include <signal.h>	86	#include <signal.h>
87	#ifndef __APPLE__	87	#if !defined(__APPLE__) && !defined(_MSC_VER)
88	#include <wait.h>	88	#include <wait.h>
89	#endif	89	#endif
90		90
91	#include "extern.h"	91	#include "extern.h"
92		92
93	/* temporarily comment out spwan code as it does not actually work yet */	93	/* temporarily comment out spawn code as it does not actually work yet */
94	#undef HAVE_SPAWN_H	94	#undef HAVE_SPAWN_H
95	#if HAVE_SPAWN_H	95	#if HAVE_SPAWN_H
96	# include <spawn.h>	96	# include <spawn.h>