From 4377ff3e1ff9aa6bc6d3e4a7d803282e50399d09 Mon Sep 17 00:00:00 2001 From: cascade Date: Tue, 11 Nov 2003 22:08:14 +0000 Subject: [PATCH] preparation to STL streams shift, modification of MS VStudio projects templates resources --- src/WOKTclLib/config.h | 198 +++++++++++++++++++++--------------- src/WOKTclLib/template.dsp | 18 ++-- src/WOKTclLib/template.dspx | 12 +-- 3 files changed, 130 insertions(+), 98 deletions(-) diff --git a/src/WOKTclLib/config.h b/src/WOKTclLib/config.h index 38215e2..705ddde 100755 --- a/src/WOKTclLib/config.h +++ b/src/WOKTclLib/config.h @@ -1,3 +1,7 @@ +<<<<<<<<<<<<<< variant A +/* config.h. Generated by configure. */ +/* config.h.in. Generated from configure.in by autoheader. */ +>>>>>>>>>>>>>> variant B #ifdef HAVE_WOK_CONFIG_H @@ -13,151 +17,166 @@ /* config.h. Generated automatically by configure. */ /* config.h.in. Generated automatically from configure.ac by autoheader. */ +======= end of combination /* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP systems. This function is required for `alloca.c' support on those systems. */ /* #undef CRAY_STACKSEG_END */ -/* Define if using `alloca.c'. */ -/*#define C_ALLOCA */ +/* Define to 1 if using `alloca.c'. */ +/* #undef C_ALLOCA */ /* define if the compiler allows redefinition of stream input and output */ #undef DEF_IOS_OK -/* Define if you have `alloca', as a function or macro. */ -#define HAVE_ALLOCA 1 +/* Define to 1 if you have `alloca', as a function or macro. */ +#define HAVE_ALLOCA_H 1 -/* Define if you have and it should be used (not on Ultrix). */ -/*#define HAVE_ALLOCA_H 1 */ +#define HAVE_FSTREAM 1 -/* Define if you have the header file. */ +#define HAVE_IOSTREAM 1 +#define HAVE_IOMANIP 1 +/* Define to 1 if you have and it should be used (not on Ultrix). + */ +#define HAVE_ALLOCA_H 1 + +/* Define to 1 if you have the header file. */ #define HAVE_BITS_SIGSET_H 1 -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ /* #undef HAVE_BSTRING_H */ -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #define HAVE_DIRENT_H 1 -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #define HAVE_DLFCN_H 1 -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ /* #undef HAVE_DL_H */ /* Define if we have the Adobe postscript library -ldps. */ /* #undef HAVE_DPS */ -/* Define if you have the header file. */ -/* #undef HAVE_DPS_DPSXCLIENT_H */ +/* Define to 1 if you have the header file. */ +#define HAVE_DPS_DPSXCLIENT_H 1 /* Define if we have a function called "finite" in -lm. */ #define HAVE_FINITE -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ /* #undef HAVE_FLOATINGPOINT_H */ -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #define HAVE_FLOAT_H 1 -/* Define if you have the `gethostname' function. */ +/* Define to 1 if you have the `gethostname' function. */ #define HAVE_GETHOSTNAME 1 -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #define HAVE_GETOPT_H 1 -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ /* #undef HAVE_IEEEFP_H */ -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #define HAVE_INTTYPES_H 1 -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #define HAVE_IOMANIP_H 1 -/* Define if you have the header file. */ -#define HAVE_ISTREAM_H 1 +/* Define to 1 if you have the header file. */ +#define HAVE_IOS 1 -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ +/* #undef HAVE_IOS_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_ISTREAM 1 + +/* Define to 1 if you have the header file. */ /* #undef HAVE_LIBC_H */ -/* Define if you have the `e' library (-le). */ +/* Define to 1 if you have the `e' library (-le). */ /* #undef HAVE_LIBE */ -/* Define if you have the `inks' library (-links). */ +/* Define to 1 if you have the `inks' library (-links). */ /* #undef HAVE_LIBINKS */ -/* Define if you have the header file. */ -#define HAVE_LIMITS_H 1 +/* Define to 1 if you have the header file. */ +#define HAVE_LIMITS 1 /* Define if we have a function called "mallinfo" in -lmalloc. */ /* #undef HAVE_MALLINFO */ -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #define HAVE_MALLOC_H 1 -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #define HAVE_MEMORY_H 1 -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ /* #undef HAVE_NDIR_H */ -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #define HAVE_NETDB_H 1 -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #define HAVE_NET_IF_H 1 -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ /* #undef HAVE_OSFCN_H */ /* Define if you have the `putenv' function. */ #define HAVE_PUTENV 1 -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #define HAVE_PWD_H 1 -/* Define if you have the `regcomp' function. */ +/* Define to 1 if you have the `regcomp' function. */ #define HAVE_REGCOMP 1 -/* Define if you have the `re_comp' function. */ +/* Define to 1 if you have the `re_comp' function. */ #define HAVE_RE_COMP 1 -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ /* #undef HAVE_SIGFPE_H */ -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ /* #undef HAVE_SIGINFO_H */ -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #define HAVE_SIGNAL_H 1 -/* Define if you have the `statfs' function. */ +/* Define to 1 if you have the `statfs' function. */ #define HAVE_STATFS 1 -/* Define if you have the `statvfs' function. */ +/* Define to 1 if you have the `statvfs' function. */ #define HAVE_STATVFS 1 -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ +#define HAVE_STDINT_H 1 + +/* Define to 1 if you have the header file. */ #define HAVE_STDLIB_H 1 -/* Define if you have the `strcspn' function. */ +/* Define to 1 if you have the `strcspn' function. */ #define HAVE_STRCSPN 1 -/* Define if you have the `strdup' function. */ +/* Define to 1 if you have the `strdup' function. */ #define HAVE_STRDUP 1 -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #define HAVE_STREAM_H 1 -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #define HAVE_STRINGS_H 1 -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #define HAVE_STRING_H 1 -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #define HAVE_STRSTREAM_H 1 /* Define if you have the `strtol' function. */ @@ -166,94 +185,94 @@ /* Define if we have a function called "ieee_handler" in -lsunmath. */ /* #undef HAVE_SUNMATH */ -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ /* #undef HAVE_SYSENT_H */ -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #define HAVE_SYS_DIR_H 1 -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ /* #undef HAVE_SYS_FILIO_H */ -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #define HAVE_SYS_IOCTL_H 1 -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #define HAVE_SYS_IPC_H 1 -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ /* #undef HAVE_SYS_MACHSIG_H */ -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #define HAVE_SYS_MMAN_H 1 -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ /* #undef HAVE_SYS_NDIR_H */ -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #define HAVE_SYS_PARAM_H 1 -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #define HAVE_SYS_SELECT_H 1 -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #define HAVE_SYS_SEM_H 1 -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ /* #undef HAVE_SYS_SIGINFO_H */ -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #define HAVE_SYS_SIGNAL_H 1 -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #define HAVE_SYS_SOCKET_H 1 -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #define HAVE_SYS_STATVFS_H 1 -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #define HAVE_SYS_STAT_H 1 -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ /* #undef HAVE_SYS_SYSTEMINFO_H */ -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #define HAVE_SYS_TIMES_H 1 -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #define HAVE_SYS_TIME_H 1 -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #define HAVE_SYS_TYPES_H 1 -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #define HAVE_SYS_UNISTD_H 1 -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #define HAVE_SYS_UTSNAME_H 1 -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #define HAVE_SYS_VFS_H 1 -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ /* #undef HAVE_SYS_VNODE_H */ -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #define HAVE_TIME_H 1 -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #define HAVE_UNISTD_H 1 -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #define HAVE_VALUES_H 1 -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #define HAVE_X11_EXTENSIONS_MULTIBUF_H 1 -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ /* #undef HAVE_X11_EXTENSIONS_READDISPLAY_H */ -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ /* #undef HAVE_X11_EXTENSIONS_TRANSOVL_H */ /* Define if your C compiler doesn't accept -c and -o together. */ @@ -336,6 +355,9 @@ /* Define if using `alloca.c'. */ #define C_ALLOCA 1 +#define HAVE_FSTREAM_H 1 + +#define HAVE_IOSTREAM_H 1 /* define if the compiler allows redefinition of stream input and output */ /* #undef DEF_IOS_OK */ @@ -389,7 +411,7 @@ #define HAVE_INTTYPES_H 1 /* Define if you have the header file. */ -/* #undef HAVE_IOMANIP_H */ +#define HAVE_IOMANIP_H 1 /* Define if you have the header file. */ /* #undef HAVE_ISTREAM_H */ @@ -659,6 +681,10 @@ /* Define if using `alloca.c'. */ /* #define C_ALLOCA 1 */ +#define HAVE_FSTREAM_H 1 + +#define HAVE_IOSTREAM_H 1 + /* define if the compiler allows redefinition of stream input and output */ /* #undef DEF_IOS_OK */ @@ -711,7 +737,7 @@ #define HAVE_INTTYPES_H 1 /* Define if you have the header file. */ -/* #undef HAVE_IOMANIP_H */ +#define HAVE_IOMANIP_H 1 /* Define if you have the header file. */ /* #undef HAVE_ISTREAM_H */ @@ -935,14 +961,14 @@ STACK_DIRECTION = 0 => direction of growth unknown */ #define STACK_DIRECTION -1 -/* Define if you have the ANSI C header files. */ +/* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 /* Define if your declares `struct tm'. */ #define TM_IN_SYS_TIME 1 /* Version number of package */ -#define VERSION "4.0DVP1" +#define VERSION "5.0DVP1" /*Define MemSpy*/ #undef HAVE_MEMCPY @@ -951,7 +977,7 @@ (like Motorola and SPARC, unlike Intel and VAX). */ #define WORDS_BIGENDIAN 1 -/* Define if on AIX 3. +/* Define to 1 if on AIX 3. System headers sometimes define this. We just want to avoid a redefinition error message. */ #ifndef _ALL_SOURCE @@ -975,6 +1001,12 @@ #define WORDS_BIGENDIAN 1 +#define HAVE_FSTREAM_H 1 + +#define HAVE_IOSTREAM_H 1 + +#define HAVE_IOMANIP_H 1 +#define HAVE_LIMITS_H 1 /* Define if you have the header file. */ #define HAVE_DIRENT_H 1 diff --git a/src/WOKTclLib/template.dsp b/src/WOKTclLib/template.dsp index 80f386e..1aeaccf 100755 --- a/src/WOKTclLib/template.dsp +++ b/src/WOKTclLib/template.dsp @@ -34,12 +34,12 @@ RSC=rc.exe # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "..\..\win32\Release\__TKNAM__" +# PROP BASE Intermediate_Dir "..\..\win32\obj\__TKNAM__" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\..\win32\dll" -# PROP Intermediate_Dir "..\..\win32\Release\__TKNAM__" +# PROP Output_Dir "..\..\win32\bin" +# PROP Intermediate_Dir "..\..\win32\obj\__TKNAM__" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c @@ -60,16 +60,16 @@ LINK32=link.exe # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "..\..\win32\Debug\__TKNAM__" +# PROP BASE Intermediate_Dir "..\..\win32\objd\__TKNAM__" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\..\win32\dlld" -# PROP Intermediate_Dir "..\..\win32\Debug\__TKNAM__" +# PROP Output_Dir "..\..\win32\bind" +# PROP Intermediate_Dir "..\..\win32\objd\__TKNAM__" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /MTd /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c -# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "WNT" /D "CSFDB" /FD /c +# ADD BASE CPP /nologo /MTd /W3 /GX /Zi /Od /D "WIN32" /D "DEB" /D "_DEBUG" /D "_WINDOWS" /FD /c +# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /D "DEB" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "WNT" /D "CSFDB" /FD /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x40c /d "_DEBUG" @@ -79,7 +79,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 __TKDEP__ opengl32.lib glu32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ws2_32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:IX86 /libpath:"..\..\win32\libd" /pdb:"..\..\win32\dlld\__TKNAM__.pdb" /implib:"..\..\win32\libd\__TKNAM__.lib" +# ADD LINK32 __TKDEP__ opengl32.lib glu32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ws2_32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:IX86 /libpath:"..\..\win32\libd" /pdb:"..\..\win32\bind\__TKNAM__.pdb" /implib:"..\..\win32\libd\__TKNAM__.lib" !ENDIF diff --git a/src/WOKTclLib/template.dspx b/src/WOKTclLib/template.dspx index cf60647..ffeae8e 100755 --- a/src/WOKTclLib/template.dspx +++ b/src/WOKTclLib/template.dspx @@ -34,12 +34,12 @@ RSC=rc.exe # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "..\..\win32\Release\__XQTNAM__" +# PROP BASE Intermediate_Dir "..\..\win32\obj\__XQTNAM__" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\win32\__DEST__" -# PROP Intermediate_Dir "..\..\win32\Release\__XQTNAM__" +# PROP Intermediate_Dir "..\..\win32\obj\__XQTNAM__" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /FD /c @@ -60,16 +60,16 @@ LINK32=link.exe # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "..\..\win32\Debug\__XQTNAM__" +# PROP BASE Intermediate_Dir "..\..\win32\objd\__XQTNAM__" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "..\..\win32\__DEST__d" -# PROP Intermediate_Dir "..\..\win32\Debug\__XQTNAM__" +# PROP Intermediate_Dir "..\..\win32\objd\__XQTNAM__" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /GZ /c -# ADD CPP /nologo /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WNT" /D "CSFDB" /FD /GZ /c +# ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /D "WIN32" /D "DEB" /D "_DEBUG" /D "_WINDOWS" /FD /GZ /c +# ADD CPP /nologo /W3 /GX /Zi /Od /D "WIN32" /D "DEB" /D "_DEBUG" /D "_WINDOWS" /D "WNT" /D "CSFDB" /FD /GZ /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "_DEBUG" -- 2.39.5