diff src/share/vm/runtime/arguments.cpp @ 7627:c73c3f2c5b3b

Merge
author acorn
date Mon, 21 Jan 2013 16:11:24 -0500
parents f1c06dcee0b5 203f64878aab
children 3ac7d10a6572 8b46b0196eb0 8391fdd36e1f f64ffbf81af5 b5cb079ecaa4
line wrap: on
line diff
--- a/src/share/vm/runtime/arguments.cpp	Fri Jan 18 19:13:41 2013 +0100
+++ b/src/share/vm/runtime/arguments.cpp	Mon Jan 21 16:11:24 2013 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -532,7 +532,7 @@
 // Parses a memory size specification string.
 static bool atomull(const char *s, julong* result) {
   julong n = 0;
-  int args_read = sscanf(s, os::julong_format_specifier(), &n);
+  int args_read = sscanf(s, JULONG_FORMAT, &n);
   if (args_read != 1) {
     return false;
   }