aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorBruce Yinhe <[email protected]>2014-10-06 14:29:51 +0200
committerBruce Yinhe <[email protected]>2014-10-06 14:29:51 +0200
commitac3afd00be9a84a6c30c408256c9c41319c61d8d (patch)
treea892f6e4195e540a738afa0164860648cef70197 /erts
parentc71579736a3376e51e1ea04e9040e2696bd53ffa (diff)
parent9e48b1fd13d9b5adfbeeda3e9137c4e2b56c37e4 (diff)
downloadotp-ac3afd00be9a84a6c30c408256c9c41319c61d8d.tar.gz
otp-ac3afd00be9a84a6c30c408256c9c41319c61d8d.tar.bz2
otp-ac3afd00be9a84a6c30c408256c9c41319c61d8d.zip
Merge branch 'maint'
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()");
}