Print this page
rev 7148 : 8071501: perfMemory_solaris.cpp failing to compile with "Error: dd_fd is not a member of DIR."
Summary: Force all Solaris builds to use the same version of the DIR structure.
Reviewed-by: dcubed, dholmes, kvn

Split Split Close
Expand all
Collapse all
          --- old/hotspot/src/os/solaris/vm/jvm_solaris.h
          +++ new/hotspot/src/os/solaris/vm/jvm_solaris.h
   1    1  /*
   2      - * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
        2 + * Copyright (c) 1998, 2015, Oracle and/or its affiliates. All rights reserved.
   3    3   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   4    4   *
   5    5   * This code is free software; you can redistribute it and/or modify it
   6    6   * under the terms of the GNU General Public License version 2 only, as
   7    7   * published by the Free Software Foundation.
   8    8   *
   9    9   * This code is distributed in the hope that it will be useful, but WITHOUT
  10   10   * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  11   11   * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  12   12   * version 2 for more details (a copy is included in the LICENSE file that
↓ open down ↓ 21 lines elided ↑ open up ↑
  34   34  */
  35   35  
  36   36  #ifndef JVM_MD_H
  37   37  #define JVM_MD_H
  38   38  
  39   39  /*
  40   40   * This file is currently collecting system-specific dregs for the
  41   41   * JNI conversion, which should be sorted out later.
  42   42   */
  43   43  
       44 +#define __USE_LEGACY_PROTOTYPES__
  44   45  #include <dirent.h>             /* For DIR */
       46 +#undef __USE_LEGACY_PROTOTYPES__
  45   47  #include <sys/param.h>          /* For MAXPATHLEN */
  46   48  #include <sys/socket.h>         /* For socklen_t */
  47   49  #include <unistd.h>             /* For F_OK, R_OK, W_OK */
  48   50  #include <sys/int_types.h>      /* for intptr_t types (64 Bit cleanliness) */
  49   51  
  50   52  #define JNI_ONLOAD_SYMBOLS      {"JNI_OnLoad"}
  51   53  #define JNI_ONUNLOAD_SYMBOLS    {"JNI_OnUnload"}
  52   54  #define JVM_ONLOAD_SYMBOLS      {"JVM_OnLoad"}
  53   55  #define AGENT_ONLOAD_SYMBOLS    {"Agent_OnLoad"}
  54   56  #define AGENT_ONUNLOAD_SYMBOLS  {"Agent_OnUnload"}
↓ open down ↓ 50 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX