src/share/vm/utilities/debug.hpp

*** 1,7 ****
  /*
!  * Copyright (c) 1997, 2016, 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
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
--- 1,7 ----
  /*
!  * Copyright (c) 1997, 2017, 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
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
*** 138,147 ****
--- 138,150 ----
  #endif
  
  // For backward compatibility.
  #define assert(p, ...) vmassert(p, __VA_ARGS__)
  
+ #ifndef ASSERT
+ #define vmassert_status(p, status, msg)
+ #else
  // This version of vmassert is for use with checking return status from
  // library calls that return actual error values eg. EINVAL,
  // ENOMEM etc, rather than returning -1 and setting errno.
  // When the status is not what is expected it is very useful to know
  // what status was actually returned, so we pass the status variable as
*** 153,162 ****
--- 156,166 ----
      report_vm_status_error(__FILE__, __LINE__, "assert(" #p ") failed",        \
                             status, msg);                                       \
      BREAKPOINT;                                                                \
    }                                                                            \
  } while (0)
+ #endif
  
  // For backward compatibility.
  #define assert_status(p, status, msg) vmassert_status(p, status, msg)
  
  // guarantee is like vmassert except it's always executed -- use it for