1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
|
From: Markus Koschany <apo@debian.org>
Date: Sun, 28 Aug 2016 17:47:09 +0200
Subject: gcc 6 ftbfs
Fix FTBFS with GCC-6.
Forwarded: no
---
ide/launcher/windows/nblauncher.cpp | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/ide/launcher/windows/nblauncher.cpp b/ide/launcher/windows/nblauncher.cpp
index a1a5967..91198f1 100644
--- a/ide/launcher/windows/nblauncher.cpp
+++ b/ide/launcher/windows/nblauncher.cpp
@@ -426,7 +426,7 @@ bool NbLauncher::findCacheDir(const char *str) {
string NbLauncher::getDefaultUserDirRoot() {
TCHAR defUserDirRootChar[MAX_PATH];
if (FAILED(SHGetFolderPath(NULL, CSIDL_APPDATA, NULL, 0, defUserDirRootChar))) {
- return false;
+ return 0;
}
defUserDirRoot = ((string) defUserDirRootChar) + NETBEANS_DIRECTORY;
defUserDirRoot.erase(defUserDirRoot.rfind('\\'));
@@ -437,7 +437,7 @@ string NbLauncher::getDefaultUserDirRoot() {
string NbLauncher::getDefaultCacheDirRoot() {
TCHAR defCacheDirRootChar[MAX_PATH];
if (FAILED(SHGetFolderPath(NULL, CSIDL_LOCAL_APPDATA, NULL, 0, defCacheDirRootChar))) {
- return false;
+ return 0;
}
defCacheDirRoot = ((string) defCacheDirRootChar) + NETBEANS_CACHES_DIRECTORY;
defCacheDirRoot.erase(defCacheDirRoot.rfind('\\'));
@@ -458,7 +458,7 @@ bool NbLauncher::getOption(char *&str, const char *opt) {
logMsg("Option found: %s%s", opt, str);
return true;
}
- return false;
+ return 0;
}
bool NbLauncher::parseConfigFile(const char* path) {
@@ -466,7 +466,7 @@ bool NbLauncher::parseConfigFile(const char* path) {
FILE *file = fopen(path, "r");
if (!file) {
logErr(true, false, "Cannot open file \"%s\" for reading.", path);
- return false;
+ return 0;
}
char line[4096] = "";
|
