aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorBruce Yinhe <[email protected]>2014-10-06 14:25:14 +0200
committerBruce Yinhe <[email protected]>2014-10-06 14:25:14 +0200
commit9e48b1fd13d9b5adfbeeda3e9137c4e2b56c37e4 (patch)
treed44aac0396b4a533674a3373a7f153b921363fa6 /erts
parent5625b21b1f5c11ec3624d67f8a3f0b7ba3415d9d (diff)
parentc9b40bf1c30d60f76b6954c0d35bee82912531a0 (diff)
downloadotp-9e48b1fd13d9b5adfbeeda3e9137c4e2b56c37e4.tar.gz
otp-9e48b1fd13d9b5adfbeeda3e9137c4e2b56c37e4.tar.bz2
otp-9e48b1fd13d9b5adfbeeda3e9137c4e2b56c37e4.zip
Merge branch 'jjhoo/win32-fix-unreachable-code' into maint
OTP-12222 * jjhoo/win32-fix-unreachable-code: Fix if-clauses that make code to be unreachable
Diffstat (limited to 'erts')
-rw-r--r--erts/etc/win32/Install.c2
-rw-r--r--erts/etc/win32/erl.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/erts/etc/win32/Install.c b/erts/etc/win32/Install.c
index 500fd166f8..9d85d642ab 100644
--- a/erts/etc/win32/Install.c
+++ b/erts/etc/win32/Install.c
@@ -80,7 +80,7 @@ int wmain(int argc, wchar_t **argv)
}
}
if (root == NULL) {
- if (module = NULL) {
+ if (module == NULL) {
fprintf(stderr, "Cannot GetModuleHandle()\n");
exit(1);
}
diff --git a/erts/etc/win32/erl.c b/erts/etc/win32/erl.c
index 1d116bf36e..772b668586 100644
--- a/erts/etc/win32/erl.c
+++ b/erts/etc/win32/erl.c
@@ -264,7 +264,7 @@ static void get_parameters(void)
int len;
- if (module = NULL) {
+ if (module == NULL) {
error("Cannot GetModuleHandle()");
}