2 files changed, 12 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index af13ba0f303..a9303a47d6e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2007-07-20  Eli Zaretskii  <eliz@gnu.org>
+
+        * w32proc.c (IMAGE_NT_OPTIONAL_HDR32_MAGIC, IMAGE_OPTIONAL_HEADER32):
+        Define if not defined.
+
 2007-07-18  Jason Rumney  <jasonr@gnu.org>
 
         * w32proc.c (w32_executable_type): Handle 64 bit executables.
diff --git a/src/w32proc.c b/src/w32proc.c
index 7d1717792ab..8c99a0a1dff 100644
--- a/src/w32proc.c
+++ b/src/w32proc.c
@@ -590,6 +590,13 @@ get_result:
   return pid;
 }
 
+/* Old versions of w32api headers don't have separate 32-bit and
+   64-bit defines, but the one they have matches the 32-bit variety.  */
+#ifndef IMAGE_NT_OPTIONAL_HDR32_MAGIC
+# define IMAGE_NT_OPTIONAL_HDR32_MAGIC IMAGE_NT_OPTIONAL_HDR_MAGIC
+# define IMAGE_OPTIONAL_HEADER32 IMAGE_OPTIONAL_HEADER
+#endif
+
 void
 w32_executable_type (char * filename, int * is_dos_app, int * is_cygnus_app, int * is_gui_app)
 {