mirror of
https://github.com/Karaka-Management/cOMS.git
synced 2026-01-25 01:08:40 +00:00
Merge
This commit is contained in:
commit
40fc9b5bb5
|
|
@ -17,11 +17,11 @@
|
|||
#include <direct.h>
|
||||
#include <io.h>
|
||||
|
||||
typedef _chdir chdir;
|
||||
typedef _getcwd getcwd;
|
||||
#define _chdir chdir;
|
||||
#define _getcwd getcwd;
|
||||
|
||||
#ifdef _MSC_VER
|
||||
typedef _access_s access;
|
||||
#define _access_s access;
|
||||
#else
|
||||
#include <unistd.h>
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@ namespace Utils
|
|||
size_t c = 0;
|
||||
while (*haystack && c < i + match * (newLength - oldLength)) {
|
||||
if (strstr(haystack, needle) == haystack) {
|
||||
strcpy(&result[c], replace);
|
||||
strcpy(&result[c], (char *) replace);
|
||||
|
||||
c += newLength;
|
||||
haystack += oldLength;
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user