Index: cvsmanager/CvsMgrMsg.h =================================================================== RCS file: /scotty/cvsmanager/CvsMgrMsg.h,v retrieving revision 1.3 diff -c -r1.3 CvsMgrMsg.h *** cvsmanager/CvsMgrMsg.h 19 Aug 2024 01:23:56 -0000 1.3 --- cvsmanager/CvsMgrMsg.h 26 Aug 2024 14:03:35 -0000 *************** *** 1,5 **** // ! // Values are 32 bit values laid out as follows: // // 3 3 2 2 2 2 2 2 2 2 2 2 1 1 1 1 1 1 1 1 1 1 // 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 --- 1,5 ---- // ! // Values are 32 bit values layed out as follows: // // 3 3 2 2 2 2 2 2 2 2 2 2 1 1 1 1 1 1 1 1 1 1 // 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 *************** *** 39,45 **** // // MessageText: // ! // %1 // #define MSG_ISTRING 0x40000001L --- 39,45 ---- // // MessageText: // ! // %1 // #define MSG_ISTRING 0x40000001L *************** *** 48,54 **** // // MessageText: // ! // %1 // #define MSG_ESTRING 0xC0000002L --- 48,54 ---- // // MessageText: // ! // %1 // #define MSG_ESTRING 0xC0000002L *************** *** 57,63 **** // // MessageText: // ! // %1 // #define MSG_WSTRING 0x80000003L --- 57,63 ---- // // MessageText: // ! // %1 // #define MSG_WSTRING 0x80000003L *************** *** 66,72 **** // // MessageText: // ! // %1 // #define MSG_SSTRING 0x00000004L --- 66,72 ---- // // MessageText: // ! // %1 // #define MSG_SSTRING 0x00000004L Index: cvsmanager/CvsMgrMsg.rc =================================================================== RCS file: /scotty/cvsmanager/CvsMgrMsg.rc,v retrieving revision 1.2 diff -c -r1.2 CvsMgrMsg.rc *** cvsmanager/CvsMgrMsg.rc 19 Aug 2024 01:23:56 -0000 1.2 --- cvsmanager/CvsMgrMsg.rc 26 Aug 2024 14:03:35 -0000 *************** *** 1,2 **** LANGUAGE 0x9,0x1 ! 1 11 "MSG00001.bin" --- 1,2 ---- LANGUAGE 0x9,0x1 ! 1 11 MSG00001.bin Index: cvsmanager/CvsMgrService.cpp =================================================================== RCS file: /scotty/cvsmanager/CvsMgrService.cpp,v retrieving revision 1.34 diff -c -r1.34 CvsMgrService.cpp *** cvsmanager/CvsMgrService.cpp 19 Aug 2024 01:23:56 -0000 1.34 --- cvsmanager/CvsMgrService.cpp 26 Aug 2024 13:56:24 -0000 *************** *** 673,685 **** WCHAR spns[2][256]; LPCWSTR spnList[2] = { spns[0], spns[1] }; - #if _MSC_VER < 1930 - snwprintf(spns[0],256,L"cvs/%s",shortName); - snwprintf(spns[1],256,L"cvs/%s",longName); - #else _snwprintf(spns[0], 256, L"cvs/%s", shortName); _snwprintf(spns[1], 256, L"cvs/%s", longName); - #endif if(g_bTestMode) { --- 673,680 ---- Index: build.h =================================================================== RCS file: /usr/local/cvs/cvsnt/build.h,v retrieving revision 1.1.2.173.4.320.2.363 diff -c -r1.1.2.173.4.320.2.363 build.h *** build.h 10 Aug 2024 11:14:17 -0000 1.1.2.173.4.320.2.363 --- build.h 26 Aug 2024 13:56:33 -0000 *************** *** 1 **** ! #define CVSNT_PRODUCT_BUILD 8978 --- 1 ---- ! #define CVSNT_PRODUCT_BUILD 8979 Index: cvsapi/cvsapi.h =================================================================== RCS file: /usr/local/cvs/cvsnt/cvsapi/cvsapi.h,v retrieving revision 1.1.2.21.4.4.2.2 diff -c -r1.1.2.21.4.4.2.2 cvsapi.h *** cvsapi/cvsapi.h 19 Aug 2024 01:12:26 -0000 1.1.2.21.4.4.2.2 --- cvsapi/cvsapi.h 26 Aug 2024 12:23:58 -0000 *************** *** 19,24 **** --- 19,30 ---- #define CVSAPI__H #ifdef _WIN32 + + #if _MSC_VER < 1900 /* 1900 == VS2015 has real snprintf */ + #define snprintf _snprintf + #define vsnprintf _vsnprintf + #endif + // this means we require windows XP // #define WINVER 0x501 // #define _WIN32_WINNT 0x501 *************** *** 42,47 **** --- 48,55 ---- #define WINVER 0x0A00 #endif #endif + + #ifdef _WIN32 // Microsoft braindamage reversal. Index: src/parseinfo.cpp =================================================================== RCS file: /usr/local/cvs/cvsnt/src/parseinfo.c,v retrieving revision 1.22.2.31.6.8.2.5 diff -c -r1.22.2.31.6.8.2.5 parseinfo.cpp *** src/parseinfo.cpp 21 Aug 2024 13:52:07 -0000 1.22.2.31.6.8.2.5 --- src/parseinfo.cpp 26 Aug 2024 23:19:01 -0000 *************** *** 116,122 **** --- 116,126 ---- global_real_session_time,remote_host_name?remote_host_name:hostname, CVS_Username,current_parsed_root->unparsed_directory, current_parsed_root->directory,global_session_id,Editor, + #if defined _WIN32 && _MSC_VER < 1900 /* 1900 == VS2015 has std::addressof() ? */ + count_uservar, (count_uservar>0)?&uservar[0]:NULL, (count_uservar>0)?&userval[0]:NULL, cv, codep, verify_admin())) + #else count_uservar, (count_uservar>0)?std::addressof(*uservarit):NULL, (count_uservar>0)?std::addressof(*uservalit):NULL, cv, codep, verify_admin())) + #endif { TRACE(3,"Couldn't load trigger %s",fn.c_str()); } Index: src/server.cpp =================================================================== RCS file: /usr/local/cvs/cvsnt/src/server.c,v retrieving revision 1.106.2.210.6.99.2.74 diff -c -r1.106.2.210.6.99.2.74 server.cpp *** src/server.cpp 26 Aug 2024 10:29:57 -0000 1.106.2.210.6.99.2.74 --- src/server.cpp 26 Aug 2024 13:55:56 -0000 *************** *** 23,33 **** #pragma message ( "Microsoft C " PP_STRINGIZE(_MSC_FULL_VER) ) #endif #pragma message ( "CVS Suite (CVSNT) Product Year " PP_STRINGIZE(CVSNT_PRODUCT_YEAR) ) ! #ifdef _DEBUG ! #if (!defined(_MSC_VER)) || (_MSC_VER < 1930) || (!defined(CVSNT_PRODUCT_YEAR)) || (CVSNT_PRODUCT_YEAR!=2025) ! #error "wrong year " ! #endif ! #endif // _DEBUG #ifdef _WIN32 #include "../pcre/pcreposix.h" --- 23,33 ---- #pragma message ( "Microsoft C " PP_STRINGIZE(_MSC_FULL_VER) ) #endif #pragma message ( "CVS Suite (CVSNT) Product Year " PP_STRINGIZE(CVSNT_PRODUCT_YEAR) ) ! //#ifdef _DEBUG ! //#if (!defined(_MSC_VER)) || (_MSC_VER < 1930) || (!defined(CVSNT_PRODUCT_YEAR)) || (CVSNT_PRODUCT_YEAR!=2025) ! //#error "wrong year " ! //#endif ! //#endif // _DEBUG #ifdef _WIN32 #include "../pcre/pcreposix.h" Index: windows-NT/config.h =================================================================== RCS file: /usr/local/cvs/cvsnt/windows-NT/config.h,v retrieving revision 1.55.2.60.6.5.4.8 diff -c -r1.55.2.60.6.5.4.8 config.h *** windows-NT/config.h 19 Aug 2024 01:12:27 -0000 1.55.2.60.6.5.4.8 --- windows-NT/config.h 26 Aug 2024 23:19:01 -0000 *************** *** 400,408 **** #define strcasecmp stricmp #define strncasecmp strnicmp ! #if defined _WINDOWS && !defined __WINE__ && _MSC_VER < 1900 /* 1900 == VS2015 has real snprintf */ ! #define vsnprintf _vsnprintf #define snprintf _snprintf #endif #define HAVE_GSSAPI_GSSAPI_H --- 400,408 ---- #define strcasecmp stricmp #define strncasecmp strnicmp ! #if defined _WIN32 && _MSC_VER < 1900 /* 1900 == VS2015 has real snprintf */ #define snprintf _snprintf + #define vsnprintf _vsnprintf #endif #define HAVE_GSSAPI_GSSAPI_H Index: windows-NT/setuid/setuid/setuidmsg.h =================================================================== RCS file: /usr/local/cvs/cvsnt/windows-NT/setuid/setuid/setuidmsg.h,v retrieving revision 1.1.2.3 diff -c -r1.1.2.3 setuidmsg.h *** windows-NT/setuid/setuid/setuidmsg.h 10 Aug 2024 00:35:49 -0000 1.1.2.3 --- windows-NT/setuid/setuid/setuidmsg.h 26 Aug 2024 14:02:10 -0000 *************** *** 1,5 **** // ! // Values are 32 bit values laid out as follows: // // 3 3 2 2 2 2 2 2 2 2 2 2 1 1 1 1 1 1 1 1 1 1 // 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 --- 1,5 ---- // ! // Values are 32 bit values layed out as follows: // // 3 3 2 2 2 2 2 2 2 2 2 2 1 1 1 1 1 1 1 1 1 1 // 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 *************** *** 39,45 **** // // MessageText: // ! // %1 // #define MSG_ISTRING 0x40000001L --- 39,45 ---- // // MessageText: // ! // %1 // #define MSG_ISTRING 0x40000001L *************** *** 48,54 **** // // MessageText: // ! // %1 // #define MSG_ESTRING 0xC0000002L --- 48,54 ---- // // MessageText: // ! // %1 // #define MSG_ESTRING 0xC0000002L *************** *** 57,63 **** // // MessageText: // ! // %1 // #define MSG_WSTRING 0x80000003L --- 57,63 ---- // // MessageText: // ! // %1 // #define MSG_WSTRING 0x80000003L *************** *** 66,72 **** // // MessageText: // ! // %1 // #define MSG_SSTRING 0x00000004L --- 66,72 ---- // // MessageText: // ! // %1 // #define MSG_SSTRING 0x00000004L Index: windows-NT/setuid/setuid/setuidmsg.rc =================================================================== RCS file: /usr/local/cvs/cvsnt/windows-NT/setuid/setuid/setuidmsg.rc,v retrieving revision 1.1.2.2 diff -c -r1.1.2.2 setuidmsg.rc *** windows-NT/setuid/setuid/setuidmsg.rc 10 Aug 2024 00:35:49 -0000 1.1.2.2 --- windows-NT/setuid/setuid/setuidmsg.rc 26 Aug 2024 14:02:10 -0000 *************** *** 1,2 **** LANGUAGE 0x9,0x1 ! 1 11 "MSG00001.bin" --- 1,2 ---- LANGUAGE 0x9,0x1 ! 1 11 MSG00001.bin Index: xdiff/xml_xdiff.cpp =================================================================== RCS file: /usr/local/cvs/cvsnt/xdiff/xml_xdiff.cpp,v retrieving revision 1.1.2.15.4.1.4.5 diff -c -r1.1.2.15.4.1.4.5 xml_xdiff.cpp *** xdiff/xml_xdiff.cpp 21 Aug 2024 13:47:35 -0000 1.1.2.15.4.1.4.5 --- xdiff/xml_xdiff.cpp 26 Aug 2024 12:03:50 -0000 *************** *** 186,191 **** --- 186,192 ---- std::pair *thispair = &changed[i + 1]; std::vector >::iterator it = changed.begin(); it += (i + 1); + #if _MSC_VER >= 1900 // at this point thispair == it // // _Ptr us MSVC specific, see: *************** *** 199,204 **** --- 200,206 ---- xdiff_print("did not find the iterator for this changed pair!\n"); return 1; } + #endif changed.erase(it); } else