Mercurial > hg > graal-jvmci-8
changeset 22874:6a4b9e574124
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
author | gthornbr |
---|---|
date | Fri, 06 Mar 2015 17:33:37 -0800 |
parents | beec0d054a8b |
children | deddcc0c31e3 |
files | src/os/solaris/vm/jvm_solaris.h src/share/vm/utilities/globalDefinitions_sparcWorks.hpp |
diffstat | 2 files changed, 6 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/os/solaris/vm/jvm_solaris.h Fri Mar 06 07:09:40 2015 -0800 +++ b/src/os/solaris/vm/jvm_solaris.h Fri Mar 06 17:33:37 2015 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2015, 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 @@ -41,7 +41,9 @@ * JNI conversion, which should be sorted out later. */ +#define __USE_LEGACY_PROTOTYPES__ #include <dirent.h> /* For DIR */ +#undef __USE_LEGACY_PROTOTYPES__ #include <sys/param.h> /* For MAXPATHLEN */ #include <sys/socket.h> /* For socklen_t */ #include <unistd.h> /* For F_OK, R_OK, W_OK */
--- a/src/share/vm/utilities/globalDefinitions_sparcWorks.hpp Fri Mar 06 07:09:40 2015 -0800 +++ b/src/share/vm/utilities/globalDefinitions_sparcWorks.hpp Fri Mar 06 17:33:37 2015 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2015, 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 @@ -33,7 +33,9 @@ # include <ctype.h> +#define __USE_LEGACY_PROTOTYPES__ # include <dirent.h> +#undef __USE_LEGACY_PROTOTYPES__ # include <string.h> # include <strings.h> // for bsd'isms # include <stdarg.h>