Skip to content

Commit bcdde78

Browse files
committed
Fix DOS macro issue once and for all
1 parent a47efc5 commit bcdde78

2 files changed

Lines changed: 7 additions & 7 deletions

File tree

clib/clib.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
# define FMT_FLOAT_SUPPORTED 1
4343
# define FOPEN_BINARY "b"
4444
#endif
45-
#if !defined(MSDOS) || defined(M_I386)
45+
#if !defined(__DOS__) || defined(__PMODEW__)
4646
# define IS_32BIT 1
4747
#endif
4848

pcireg/pcireg.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
# include <stdint.h>
2929
# include <string.h>
3030
# include <stdlib.h>
31-
# ifdef MSDOS
31+
# if defined(__DOS__) || defined(__PMODEW__)
3232
# include <dos.h>
3333
# include <i86.h>
3434
# endif
@@ -101,7 +101,7 @@ static const char *bridge_flags[] = {
101101
};
102102

103103
static int term_width;
104-
#if defined(MSDOS)
104+
#if defined(__DOS__) || defined(__PMODEW__)
105105
static union REGS regs;
106106
static struct SREGS seg_regs;
107107
# pragma pack(push, 1)
@@ -151,7 +151,7 @@ static struct PACKED {
151151
} *pciids_progif = NULL;
152152
static char *pciids_string = NULL;
153153

154-
#if defined(MSDOS)
154+
#if defined(__DOS__) || defined(__PMODEW__)
155155
typedef struct {
156156
uint8_t bus, dev;
157157
struct {
@@ -1083,7 +1083,7 @@ dump_info(uint8_t bus, uint8_t dev, uint8_t func)
10831083
return 0;
10841084
}
10851085

1086-
#if defined(MSDOS)
1086+
#if defined(__DOS__) || defined(__PMODEW__)
10871087
static int
10881088
comp_irq_routing_entry(const void *elem1, const void *elem2)
10891089
{
@@ -1564,7 +1564,7 @@ main(int argc, char **argv)
15641564
usage:
15651565
printf("%s -s [-d]\n", ch);
15661566
printf("∟ Display all devices on the PCI bus. Specify -d to dump registers as well.\n");
1567-
#if defined(MSDOS)
1567+
#if defined(__DOS__) || defined(__PMODEW__)
15681568
printf("\n");
15691569
printf("%s -t [-m] [-8]\n", ch);
15701570
printf("∟ Display BIOS IRQ steering table. Specify -m to look for a Microsoft $PIR\n");
@@ -1615,7 +1615,7 @@ main(int argc, char **argv)
16151615
else
16161616
return scan_buses('\0');
16171617
}
1618-
#if defined(MSDOS)
1618+
#if defined(__DOS__) || defined(__PMODEW__)
16191619
else if (argv[1][1] == 't') {
16201620
/* Steering table display asks for optional parameters. */
16211621
reg = 0;

0 commit comments

Comments
 (0)