equal
deleted
inserted
replaced
1 /* |
1 /* |
2 * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. |
2 * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. |
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 * |
4 * |
5 * This code is free software; you can redistribute it and/or modify it |
5 * This code is free software; you can redistribute it and/or modify it |
6 * under the terms of the GNU General Public License version 2 only, as |
6 * under the terms of the GNU General Public License version 2 only, as |
7 * published by the Free Software Foundation. Oracle designates this |
7 * published by the Free Software Foundation. Oracle designates this |
177 int running = CURRENT_DATA_MODEL; |
177 int running = CURRENT_DATA_MODEL; |
178 |
178 |
179 int wanted = running; |
179 int wanted = running; |
180 |
180 |
181 char** argv = *pargv; |
181 char** argv = *pargv; |
182 for (i = 0; i < *pargc ; i++) { |
182 for (i = 1; i < *pargc ; i++) { |
183 if (JLI_StrCmp(argv[i], "-J-d64") == 0 || JLI_StrCmp(argv[i], "-d64") == 0) { |
183 if (JLI_StrCmp(argv[i], "-J-d64") == 0 || JLI_StrCmp(argv[i], "-d64") == 0) { |
184 wanted = 64; |
184 wanted = 64; |
185 continue; |
185 continue; |
186 } |
186 } |
187 if (JLI_StrCmp(argv[i], "-J-d32") == 0 || JLI_StrCmp(argv[i], "-d32") == 0) { |
187 if (JLI_StrCmp(argv[i], "-J-d32") == 0 || JLI_StrCmp(argv[i], "-d32") == 0) { |
188 wanted = 32; |
188 wanted = 32; |
189 continue; |
189 continue; |
190 } |
190 } |
|
191 |
|
192 if (IsJavaArgs() && argv[i][0] != '-') |
|
193 continue; |
|
194 if (argv[i][0] != '-') |
|
195 break; |
191 } |
196 } |
192 if (running != wanted) { |
197 if (running != wanted) { |
193 JLI_ReportErrorMessage(JRE_ERROR2, wanted); |
198 JLI_ReportErrorMessage(JRE_ERROR2, wanted); |
194 exit(1); |
199 exit(1); |
195 } |
200 } |