Zengtudor/ccls
1
0
Fork 0
mirror of https://github.com/MaskRay/ccls.git synced 2025-06-07 16:54:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix build errors on Windows after massive rename.

Browse Source
This commit is contained in:
Riatre Foo 2019-08-31 06:22:45 +08:00
parent 3bc28996b9
commit de2f1ea5f2
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/platform_win.cc
View File

@ -31,7 +31,7 @@ limitations under the License.
#include <thread> #include <thread>
namespace ccls { namespace ccls {
std::string NormalizePath(const std::string &path) { std::string normalizePath(const std::string &path) {
DWORD retval = 0; DWORD retval = 0;
TCHAR buffer[MAX_PATH] = TEXT(""); TCHAR buffer[MAX_PATH] = TEXT("");
TCHAR **lpp_part = {NULL}; TCHAR **lpp_part = {NULL};
@ -52,12 +52,12 @@ std::string NormalizePath(const std::string &path) {
return result; return result;
} }
void FreeUnusedMemory() {} void freeUnusedMemory() {}
// TODO Wait for debugger to attach // TODO Wait for debugger to attach
void TraceMe() {} void traceMe() {}
void SpawnThread(void *(*fn)(void *), void *arg) { void spawnThread(void *(*fn)(void *), void *arg) {
std::thread(fn, arg).detach(); std::thread(fn, arg).detach();
} }
} // namespace ccls } // namespace ccls

8
src/project.cc
View File

@ -378,7 +378,7 @@ void Project::loadDirectory(const std::string &root, Project::Folder &folder) {
#ifdef _WIN32 #ifdef _WIN32
char tmpdir[L_tmpnam]; char tmpdir[L_tmpnam];
tmpnam_s(tmpdir, L_tmpnam); tmpnam_s(tmpdir, L_tmpnam);
CDBDir = tmpdir; cDBDir = tmpdir;
if (sys::fs::create_directory(tmpdir, false)) if (sys::fs::create_directory(tmpdir, false))
return; return;
#else #else
@ -414,9 +414,9 @@ void Project::loadDirectory(const std::string &root, Project::Folder &folder) {
tooling::CompilationDatabase::loadFromDirectory(cDBDir, err_msg); tooling::CompilationDatabase::loadFromDirectory(cDBDir, err_msg);
if (!g_config->compilationDatabaseCommand.empty()) { if (!g_config->compilationDatabaseCommand.empty()) {
#ifdef _WIN32 #ifdef _WIN32
DeleteFileA(StdinPath.c_str()); DeleteFileA(stdinPath.c_str());
DeleteFileA(Path.c_str()); DeleteFileA(path.c_str());
RemoveDirectoryA(CDBDir.c_str()); RemoveDirectoryA(cDBDir.c_str());
#else #else
unlink(stdinPath.c_str()); unlink(stdinPath.c_str());
unlink(path.c_str()); unlink(path.c_str());