diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4737fa0e3c5..d9b3523dfa3 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2003-06-13  Matt Kraai  <kraai@alumni.cmu.edu>
+
+	* unwind-c.c: Define NO_SIZE_OF_ENCODED_VALUE.
+	* unwind-pe.h (size_of_encoded_value): Do not define if
+	NO_SIZE_OF_ENCODED_VALUE is defined.
+
 2003-06-13  Roger Sayle  <roger@eyesopen.com>
 
 	* expr.c (expand_expr <COMPLEX_CST>): Handle the case of
diff --git a/gcc/unwind-c.c b/gcc/unwind-c.c
index 9ce09568988..8f2f5c43fe0 100644
--- a/gcc/unwind-c.c
+++ b/gcc/unwind-c.c
@@ -23,6 +23,7 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include "tconfig.h"
 #include "tsystem.h"
 #include "unwind.h"
+#define NO_SIZE_OF_ENCODED_VALUE
 #include "unwind-pe.h"
 
 typedef struct
diff --git a/gcc/unwind-pe.h b/gcc/unwind-pe.h
index d32e506667d..bfa455c4f32 100644
--- a/gcc/unwind-pe.h
+++ b/gcc/unwind-pe.h
@@ -52,6 +52,8 @@
 #define DW_EH_PE_indirect	0x80
 
 
+#ifndef NO_SIZE_OF_ENCODED_VALUE
+
 /* Given an encoding, return the number of bytes the format occupies.
    This is only defined for fixed-size encodings, and so does not
    include leb128.  */
@@ -76,6 +78,8 @@ size_of_encoded_value (unsigned char encoding)
   __gxx_abort ();
 }
 
+#endif
+
 #ifndef NO_BASE_OF_ENCODED_VALUE
 
 /* Given an encoding and an _Unwind_Context, return the base to which