aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGustav Simonsson <[email protected]>2012-03-20 11:58:47 +0100
committerGustav Simonsson <[email protected]>2012-03-20 11:58:47 +0100
commite6b91dfe835ec1c5234709c1b5edb9a6e5ad0d1b (patch)
tree28b955dbb950483f71b8a2f016bbaf1800aff22e
parentc93be7c2b7732ef6212186dd8107590805d1ca58 (diff)
parentee94b8170bf475cba219da912a385c3f87046ae5 (diff)
downloadotp-e6b91dfe835ec1c5234709c1b5edb9a6e5ad0d1b.tar.gz
otp-e6b91dfe835ec1c5234709c1b5edb9a6e5ad0d1b.tar.bz2
otp-e6b91dfe835ec1c5234709c1b5edb9a6e5ad0d1b.zip
Merge branch 'maint'
-rw-r--r--erts/etc/common/escript.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/erts/etc/common/escript.c b/erts/etc/common/escript.c
index 6ed79c91e3..e70c95b67c 100644
--- a/erts/etc/common/escript.c
+++ b/erts/etc/common/escript.c
@@ -377,7 +377,8 @@ main(int argc, char** argv)
last_opt = argv;
#ifdef __WIN32__
- if (_stricmp(basename, "escript.exe") == 0) {
+ if ( (_stricmp(basename, "escript.exe") == 0)
+ ||(_stricmp(basename, "escript") == 0)) {
#else
if (strcmp(basename, "escript") == 0) {
#endif