forked from omniti-labs/omnios-build
-
-
Notifications
You must be signed in to change notification settings - Fork 99
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
openjdk17: update from 17.0.9+9 17.0.10+7
- Loading branch information
Showing
4 changed files
with
39 additions
and
5 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,33 @@ | ||
While we do have stafs(2) it has a different signature, is deprecated and | ||
undocumented, while statvfs() gives the behaviour we actually want. | ||
|
||
--- a/test/jdk/java/io/File/libGetXSpace.c Wed Apr 5 22:54:38 2023 | ||
+++ b/test/jdk/java/io/File/libGetXSpace.c Thu Apr 6 14:28:43 2023 | ||
@@ -34,9 +34,13 @@ | ||
#include <sys/param.h> | ||
#include <sys/mount.h> | ||
#else | ||
+#ifdef __sun__ | ||
+#include <sys/statvfs.h> | ||
+#else | ||
#include <sys/statfs.h> | ||
#endif | ||
#endif | ||
+#endif | ||
|
||
#ifdef __cplusplus | ||
extern "C" { | ||
@@ -142,8 +146,13 @@ | ||
chars[len] = '\0'; | ||
(*env)->ReleaseStringChars(env, root, strchars); | ||
|
||
+#ifdef __sun__ | ||
+ struct statvfs buf; | ||
+ int result = statvfs((const char*)chars, &buf); | ||
+#else | ||
struct statfs buf; | ||
int result = statfs((const char*)chars, &buf); | ||
+#endif | ||
free(chars); | ||
if (result < 0) { | ||
JNU_ThrowByNameWithLastError(env, "java/lang/RuntimeException", |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters