summaryrefslogtreecommitdiff
path: root/src/kern
diff options
context:
space:
mode:
authorGabe Black <gblack@eecs.umich.edu>2010-05-06 13:41:33 -0700
committerGabe Black <gblack@eecs.umich.edu>2010-05-06 13:41:33 -0700
commitd9845938554c47ab26847d8ea7a5d4f44e4a908b (patch)
tree584f1a16bca42e102a1584ca00adaa4d24e9589c /src/kern
parent81e68287bb65a4bb57ef000e3890c237504bb555 (diff)
parentc4057a13f1299db5b2d6621a4158984da893bc5e (diff)
downloadgem5-d9845938554c47ab26847d8ea7a5d4f44e4a908b.tar.xz
Merge.
Diffstat (limited to 'src/kern')
-rw-r--r--src/kern/tru64/tru64.hh2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/kern/tru64/tru64.hh b/src/kern/tru64/tru64.hh
index 033f30946..d0c11a934 100644
--- a/src/kern/tru64/tru64.hh
+++ b/src/kern/tru64/tru64.hh
@@ -437,7 +437,7 @@ class Tru64 : public OperatingSystem
{
using namespace TheISA;
-#ifdef __CYGWIN__
+#if defined(__APPLE__) || defined(__CYGWIN__)
panic("getdirent not implemented on cygwin!");
#else
int index = 0;