diff options
| -rw-r--r-- | libjava/ChangeLog | 7 | ||||
| -rw-r--r-- | libjava/include/posix.h | 9 | ||||
| -rw-r--r-- | libjava/java/io/natFileDescriptorPosix.cc | 2 |
3 files changed, 16 insertions, 2 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 7c1c20d..c59eb75 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,10 @@ +2002-06-05 Loren J. Rittle <ljrittle@acm.org> + + * libjava/include/posix.h (O_SYNC): Define if not available + and a reasonable, perhaps more conservative, replacement exists. + (O_DSYNC): Likewise. + * java/io/natFileDescriptorPosix.cc (open): Revert last patch. + 2003-06-05 Michael Koch <konqueror@gmx.de> * javax/swing/plaf/BorderUIResource.java, diff --git a/libjava/include/posix.h b/libjava/include/posix.h index ad93753..100333c 100644 --- a/libjava/include/posix.h +++ b/libjava/include/posix.h @@ -48,6 +48,15 @@ details. */ #define _Jv_platform_solib_suffix ".so" #endif +// Some POSIX systems don't have O_SYNC and O_DYSNC so we define them here. +// Needed in java/io/natFileDescriptorPosix.cc. +#if !defined (O_SYNC) && defined (O_FSYNC) +#define O_SYNC O_FSYNC +#endif +#if !defined (O_DSYNC) && defined (O_FSYNC) +#define O_DSYNC O_FSYNC +#endif + // Separator for file name components. #define _Jv_platform_file_separator ((jchar) '/') // Separator for path components. diff --git a/libjava/java/io/natFileDescriptorPosix.cc b/libjava/java/io/natFileDescriptorPosix.cc index b8892af..2ad2d9d 100644 --- a/libjava/java/io/natFileDescriptorPosix.cc +++ b/libjava/java/io/natFileDescriptorPosix.cc @@ -105,13 +105,11 @@ java::io::FileDescriptor::open (jstring path, jint jflags) } } -/* FIXME: comment this out until its better tested/implemented if ((jflags & SYNC)) flags |= O_SYNC; if ((jflags & DSYNC)) flags |= O_DSYNC; -*/ int fd = ::open (buf, flags, mode); if (fd == -1 && errno == EMFILE) |