aboutsummaryrefslogtreecommitdiff
path: root/libjava
diff options
context:
space:
mode:
authorMatt Kraai <kraai@alumni.carnegiemellon.edu>2001-04-30 23:09:39 +0000
committerTom Tromey <tromey@gcc.gnu.org>2001-04-30 23:09:39 +0000
commitdad362764fe456881661e192c595a6774794eb82 (patch)
tree278dca5f1f18c364fa01fce1c42f46a68f79b30b /libjava
parente21382befd54450b53cf289baef96e13bf2f8948 (diff)
downloadgcc-dad362764fe456881661e192c595a6774794eb82.zip
gcc-dad362764fe456881661e192c595a6774794eb82.tar.gz
gcc-dad362764fe456881661e192c595a6774794eb82.tar.bz2
natFile.cc (performSetReadOnly): Fix #ifdef test.
2001-04-30 Matt Kraai <kraai@alumni.carnegiemellon.edu> * java/io/natFile.cc (performSetReadOnly): Fix #ifdef test. (performDelete): Fix #endif placement. From-SVN: r41703
Diffstat (limited to 'libjava')
-rw-r--r--libjava/ChangeLog5
-rw-r--r--libjava/java/io/natFile.cc4
2 files changed, 7 insertions, 2 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 2ce678a..0c144a0 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2001-04-30 Matt Kraai <kraai@alumni.carnegiemellon.edu>
+
+ * java/io/natFile.cc (performSetReadOnly): Fix #ifdef test.
+ (performDelete): Fix #endif placement.
+
2001-04-27 Zack Weinberg <zackw@stanford.edu>
* prims.cc (_Jv_ThisExecutable): Use _Jv_Malloc.
diff --git a/libjava/java/io/natFile.cc b/libjava/java/io/natFile.cc
index 89cdec6..6fa46c0 100644
--- a/libjava/java/io/natFile.cc
+++ b/libjava/java/io/natFile.cc
@@ -227,7 +227,7 @@ java::io::File::performSetReadOnly (void)
// FIXME?
buf[total] = '\0';
-#ifdef HAVE_STAT && HAVE_CHMOD
+#if defined (HAVE_STAT) && defined (HAVE_CHMOD)
struct stat sb;
if (::stat (buf, &sb))
return false;
@@ -328,8 +328,8 @@ java::io::File::performDelete (void)
#ifdef HAVE_RMDIR
if (! ::rmdir (buf))
return true;
-#endif // HAVE_RMDIR
if (errno == ENOTDIR)
+#endif // HAVE_RMDIR
return ::unlink (buf) == 0;
#endif // HAVE_UNLINK
return false;