From 57a64de0237dfc2149c91c0f0a3652d307b083c3 Mon Sep 17 00:00:00 2001
From: "Markus F.X.J. Oberhumer" <markus@oberhumer.com>
Date: Thu, 1 Jan 2009 13:40:52 +0100
Subject: [PATCH] Small conf.h update.

---
 src/conf.h       | 4 ++--
 src/p_lx_elf.cpp | 2 +-
 src/stdcxx.h     | 4 ----
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/conf.h b/src/conf.h
index 17a46fc2..cb1c3485 100644
--- a/src/conf.h
+++ b/src/conf.h
@@ -107,8 +107,8 @@
 #elif (ACC_CC_SUNPROC)
 //#  pragma error_messages(off,"badargtype2w")    // FIXME
 #elif (ACC_CC_WATCOMC)
-#  if (__WATCOMC__ < 1100)
-#    error "need Watcom C++ 11.0c or newer"
+#  if (__WATCOMC__ < 1280)
+#    error "need Open Watcom C++ 1.8 or newer"  // because earlier versions do not support nested classes
 #  endif
 #  if defined(__cplusplus)
 #    pragma warning 367 9               // w3: conditional expression in if statement is always true
diff --git a/src/p_lx_elf.cpp b/src/p_lx_elf.cpp
index 4049dff7..9344b98c 100644
--- a/src/p_lx_elf.cpp
+++ b/src/p_lx_elf.cpp
@@ -846,7 +846,7 @@ bool PackLinuxElf32::canPack()
 {
     union {
         unsigned char buf[sizeof(Elf32_Ehdr) + 14*sizeof(Elf32_Phdr)];
-        //struct { U_Elf32_Ehdr ehdr; U_Elf32_Phdr phdr; } e;
+        //struct { Elf32_Ehdr ehdr; Elf32_Phdr phdr; } e;
     } u;
     COMPILE_TIME_ASSERT(sizeof(u.buf) <= 512);
 
diff --git a/src/stdcxx.h b/src/stdcxx.h
index d3351402..a1ce5873 100644
--- a/src/stdcxx.h
+++ b/src/stdcxx.h
@@ -97,10 +97,6 @@ namespace std { class bad_alloc { }; }
 #elif (ACC_CC_SYMANTECC)
 #define std
 class bad_alloc { };
-#elif (ACC_CC_WATCOMC && (__WATCOMC__ >= 1280))
-#elif (ACC_CC_WATCOMC)
-#define std
-class bad_alloc { };
 #endif