8071501: perfMemory_solaris.cpp failing to compile with "Error: dd_fd is not a member of DIR."

Fri, 06 Mar 2015 17:33:37 -0800

author
gthornbr
date
Fri, 06 Mar 2015 17:33:37 -0800
changeset 7624
6a4b9e574124
parent 7623
beec0d054a8b
child 7625
deddcc0c31e3

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

src/os/solaris/vm/jvm_solaris.h file | annotate | diff | comparison | revisions
src/share/vm/utilities/globalDefinitions_sparcWorks.hpp file | annotate | diff | comparison | revisions
     1.1 --- a/src/os/solaris/vm/jvm_solaris.h	Fri Mar 06 07:09:40 2015 -0800
     1.2 +++ b/src/os/solaris/vm/jvm_solaris.h	Fri Mar 06 17:33:37 2015 -0800
     1.3 @@ -1,5 +1,5 @@
     1.4  /*
     1.5 - * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
     1.6 + * Copyright (c) 1998, 2015, Oracle and/or its affiliates. All rights reserved.
     1.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     1.8   *
     1.9   * This code is free software; you can redistribute it and/or modify it
    1.10 @@ -41,7 +41,9 @@
    1.11   * JNI conversion, which should be sorted out later.
    1.12   */
    1.13  
    1.14 +#define __USE_LEGACY_PROTOTYPES__
    1.15  #include <dirent.h>             /* For DIR */
    1.16 +#undef __USE_LEGACY_PROTOTYPES__
    1.17  #include <sys/param.h>          /* For MAXPATHLEN */
    1.18  #include <sys/socket.h>         /* For socklen_t */
    1.19  #include <unistd.h>             /* For F_OK, R_OK, W_OK */
     2.1 --- a/src/share/vm/utilities/globalDefinitions_sparcWorks.hpp	Fri Mar 06 07:09:40 2015 -0800
     2.2 +++ b/src/share/vm/utilities/globalDefinitions_sparcWorks.hpp	Fri Mar 06 17:33:37 2015 -0800
     2.3 @@ -1,5 +1,5 @@
     2.4  /*
     2.5 - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
     2.6 + * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
     2.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     2.8   *
     2.9   * This code is free software; you can redistribute it and/or modify it
    2.10 @@ -33,7 +33,9 @@
    2.11  
    2.12  
    2.13  # include <ctype.h>
    2.14 +#define __USE_LEGACY_PROTOTYPES__
    2.15  # include <dirent.h>
    2.16 +#undef __USE_LEGACY_PROTOTYPES__
    2.17  # include <string.h>
    2.18  # include <strings.h>     // for bsd'isms
    2.19  # include <stdarg.h>

mercurial