diff options
| author | Eli Zaretskii | 2004-05-01 17:39:43 +0000 |
|---|---|---|
| committer | Eli Zaretskii | 2004-05-01 17:39:43 +0000 |
| commit | affa509c00e901f09f68a96bdfe199164b0c2640 (patch) | |
| tree | d4cf1e860a4001267f1c48b2b7cfbb941f81822b /src | |
| parent | 9242b3b7920346fac289a025812885da86669ea7 (diff) | |
| download | emacs-affa509c00e901f09f68a96bdfe199164b0c2640.tar.gz emacs-affa509c00e901f09f68a96bdfe199164b0c2640.zip | |
(top-level): Add "#pragma pack(0)" after <dir.h>, to
undo bad effect of pack(4) in some versions of system headers.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/msdos.c | 1 |
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 @@ | |||
| 1 | 2004-05-01 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * msdos.c (top-level): Add "#pragma pack(0)" after <dir.h>, to | ||
| 4 | undo bad effect of pack(4) in some versions of system headers. | ||
| 5 | |||
| 1 | 2004-05-01 Jason Rumney <jasonr@gnu.org> | 6 | 2004-05-01 Jason Rumney <jasonr@gnu.org> |
| 2 | 7 | ||
| 3 | * w32term.c (x_draw_hollow_cursor): Sync with xterm.c | 8 | * 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. */ | |||
| 40 | #include <unistd.h> /* for chdir, dup, dup2, etc. */ | 40 | #include <unistd.h> /* for chdir, dup, dup2, etc. */ |
| 41 | #include <dir.h> /* for getdisk */ | 41 | #include <dir.h> /* for getdisk */ |
| 42 | #if __DJGPP__ >= 2 | 42 | #if __DJGPP__ >= 2 |
| 43 | #pragma pack(0) /* dir.h does a pack(4), which isn't GCC's default */ | ||
| 43 | #include <fcntl.h> | 44 | #include <fcntl.h> |
| 44 | #include <io.h> /* for setmode */ | 45 | #include <io.h> /* for setmode */ |
| 45 | #include <dpmi.h> /* for __dpmi_xxx stuff */ | 46 | #include <dpmi.h> /* for __dpmi_xxx stuff */ |