aboutsummaryrefslogtreecommitdiff
path: root/libjava
diff options
context:
space:
mode:
authorMohan Embar <gnustuff@thisiscool.com>2007-02-22 14:13:34 +0000
committerMohan Embar <membar@gcc.gnu.org>2007-02-22 14:13:34 +0000
commitd1789dc25a1a6f1d8f9e481cd094eeacdc9b2275 (patch)
tree570aaa62984dbd1195c3bb04ed5642f8dbe76496 /libjava
parent021a93e31e6e020b2b8393e3a7f99274e3ad8456 (diff)
downloadgcc-d1789dc25a1a6f1d8f9e481cd094eeacdc9b2275.zip
gcc-d1789dc25a1a6f1d8f9e481cd094eeacdc9b2275.tar.gz
gcc-d1789dc25a1a6f1d8f9e481cd094eeacdc9b2275.tar.bz2
* include/win32-threads.h: Added #undef OUT.
From-SVN: r122227
Diffstat (limited to 'libjava')
-rw-r--r--libjava/ChangeLog4
-rw-r--r--libjava/include/win32-threads.h1
2 files changed, 5 insertions, 0 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index c3ff95a..6d337d5 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,7 @@
+2007-02-22 Mohan Embar <gnustuff@thisiscool.com>
+
+ * include/win32-threads.h: Added #undef OUT.
+
2007-02-21 Kyle Galloway <kgallowa@redhat.com>
* jvmti.cc (_Jv_JVMTI_GetArgumentsSize): New function.
diff --git a/libjava/include/win32-threads.h b/libjava/include/win32-threads.h
index 442149c..b8f70f5 100644
--- a/libjava/include/win32-threads.h
+++ b/libjava/include/win32-threads.h
@@ -227,5 +227,6 @@ private:
#undef STRICT
#undef VOID
#undef TEXT
+#undef OUT
#endif /* __JV_WIN32_THREADS__ */