2 files changed, 6 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 46dbdcb2fc0..e859945b3f7 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2004-05-01  Eli Zaretskii  <eliz@gnu.org>
+
+        * msdos.c (top-level): Add "#pragma pack(0)" after <dir.h>, to
+        undo bad effect of pack(4) in some versions of system headers.
+
 2004-05-01  Jason Rumney  <jasonr@gnu.org>
 
         * w32term.c (x_draw_hollow_cursor): Sync with xterm.c
diff --git a/src/msdos.c b/src/msdos.c
index 47fdf7fa03d..6134c1beabe 100644
--- a/src/msdos.c
+++ b/src/msdos.c
@@ -40,6 +40,7 @@ Boston, MA 02111-1307, USA.  */
 #include <unistd.h>      /* for chdir, dup, dup2, etc. */
 #include <dir.h>         /* for getdisk */
 #if __DJGPP__ >= 2
+#pragma pack(0)          /* dir.h does a pack(4), which isn't GCC's default */
 #include <fcntl.h>
 #include <io.h>          /* for setmode */
 #include <dpmi.h>        /* for __dpmi_xxx stuff */