Index: dmake/tempnam.c =================================================================== RCS file: /cvs/tools/dmake/tempnam.c,v retrieving revision 1.1.1.1.40.1 diff -u -r1.1.1.1.40.1 tempnam.c --- dmake/tempnam.c 31 Jan 2003 15:35:22 -0000 1.1.1.1.40.1 +++ dmake/tempnam.c 12 Feb 2003 16:00:56 -0000 @@ -13,7 +13,10 @@ #endif #define DirEntryKind int +/* The Windows API sets this value to 260 */ +#ifndef _MAX_PATH #define _MAX_PATH 1024 +#endif #define WNT char* dtempnam( char* nix, char* prefix ) @@ -68,7 +71,7 @@ /* ret_val = new char[i+2 /* '\0' & '\\' *//* + 8 /*root*//* + 4 /*.ext*//*];*/ if (ret_val) { - strncpy(ret_val,dir, sizeof(retval)-1); + strncpy(ret_val,dir, sizeof(ret_val)-1); /* Make sure directory ends with a separator */ #if defined(DOS) || defined(PM2) || defined(WIN) || defined(WNT) @@ -105,7 +108,7 @@ #if defined(OS2) || defined(WIN) || defined(WNT) || defined(DOS) itoa(nTemp,ret_val + i,26); #else - snprintf(ret_val+i, sizeof(retval) + i, "%03u", nTemp); + snprintf(ret_val+i, sizeof(ret_val) + i, "%03u", nTemp); #endif strcat(ret_val,ext); nhandle = _open( ret_val, _O_CREAT | _O_EXCL, _S_IWRITE | _S_IREAD ); Index: dmake/unix/runargv.c =================================================================== RCS file: /cvs/tools/dmake/unix/runargv.c,v retrieving revision 1.5.4.1.2.1 diff -u -r1.5.4.1.2.1 runargv.c --- dmake/unix/runargv.c 10 Feb 2003 06:57:24 -0000 1.5.4.1.2.1 +++ dmake/unix/runargv.c 12 Feb 2003 16:00:56 -0000 @@ -84,13 +84,13 @@ */ #include -#ifndef __APPLE__ +#if !defined(__APPLE__) && !defined(_MSC_VER) #include #endif #include "extern.h" -/* temporarily comment out spwan code as it does not actually work yet */ +/* temporarily comment out spawn code as it does not actually work yet */ #undef HAVE_SPAWN_H #if HAVE_SPAWN_H # include Index: dmake/unix/cygwin/public.h =================================================================== RCS file: /cvs/tools/dmake/unix/cygwin/public.h,v retrieving revision 1.1 diff -u -r1.1 public.h --- dmake/unix/cygwin/public.h 26 Mar 2002 14:22:01 -0000 1.1 +++ dmake/unix/cygwin/public.h 12 Feb 2003 16:00:56 -0000 @@ -109,7 +109,7 @@ int Test_circle ANSI((CELLPTR, int)); STRINGPTR Def_recipe ANSI((char *, STRINGPTR, int, int)); t_attr Rcp_attribute ANSI((char *)); -void main ANSI((int, char **)); +int main ANSI((int, char **)); FILE *Openfile ANSI((char *, int, int)); FILE *Closefile ANSI(()); FILE *Search_file ANSI((char *, char **)); Index: dmake/win95/microsft/config.h =================================================================== RCS file: /cvs/tools/dmake/win95/microsft/config.h,v retrieving revision 1.2.8.1 diff -u -r1.2.8.1 config.h --- dmake/win95/microsft/config.h 31 Jan 2003 15:37:31 -0000 1.2.8.1 +++ dmake/win95/microsft/config.h 12 Feb 2003 16:00:56 -0000 @@ -85,6 +85,13 @@ -- Use cvs log to obtain detailed change logs. */ +/* Attention! In the UNIX like builds with the ./configure ; make + procedure a config.h is generated. The autogenerated config.h + must not be there to compile dmake with MSC and the + "dmake\make.bat win95-vpp40" command. This file sets (among other + things) the needed HAS_... and HAVE_... macros. +*/ + #if defined (_MSC_VER) # if _MSC_VER < 500 Force a compile-time blowup. @@ -130,7 +137,11 @@ /* MSC has sys/types.h and sys/stat.h (this is tested only with MSVC++ 6.0) */ #define HAVE_SYS_TYPES_H 1 #define HAVE_SYS_STAT_H 1 - + +/* These functions are available! (this is tested only with MSVC++ 6.0) */ +#define HAVE_GETCWD 1 +#define HAVE_UTIME_NULL 1 +#define HAVE_TZSET 1 #ifndef MSDOS # define MSDOS 1 Index: dmake/win95/microsft/vpp40/public.h =================================================================== RCS file: /cvs/tools/dmake/win95/microsft/vpp40/public.h,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 public.h --- dmake/win95/microsft/vpp40/public.h 22 Sep 2000 15:33:37 -0000 1.1.1.1 +++ dmake/win95/microsft/vpp40/public.h 12 Feb 2003 16:00:56 -0000 @@ -88,7 +88,7 @@ int Test_circle ANSI((CELLPTR, int)); STRINGPTR Def_recipe ANSI((char *, STRINGPTR, int, int)); t_attr Rcp_attribute ANSI((char *)); -void main ANSI((int, char **)); +int main ANSI((int, char **)); FILE *Openfile ANSI((char *, int, int)); FILE *Closefile ANSI(()); FILE *Search_file ANSI((char *, char **));