diff options
author | obrien <obrien@FreeBSD.org> | 2002-05-14 21:54:56 +0000 |
---|---|---|
committer | obrien <obrien@FreeBSD.org> | 2002-05-14 21:54:56 +0000 |
commit | a820a8899997d7ce8bd1585f64d3a23c3d8b5cb2 (patch) | |
tree | 82ffbeff5cd36afa7612176c59f47552d21e55bc /sys | |
parent | bac8396cc90f34d617b583831e7a5902146b56b9 (diff) | |
download | FreeBSD-src-a820a8899997d7ce8bd1585f64d3a23c3d8b5cb2.zip FreeBSD-src-a820a8899997d7ce8bd1585f64d3a23c3d8b5cb2.tar.gz |
Tighten up the defined()'s.
Diffstat (limited to 'sys')
-rw-r--r-- | sys/dev/asr/asr.c | 6 | ||||
-rw-r--r-- | sys/dev/asr/dptsig.h | 6 | ||||
-rw-r--r-- | sys/dev/asr/i2odep.h | 8 | ||||
-rw-r--r-- | sys/dev/asr/osd_defs.h | 2 | ||||
-rw-r--r-- | sys/dev/asr/osd_unix.h | 4 | ||||
-rw-r--r-- | sys/dev/asr/osd_util.h | 30 | ||||
-rw-r--r-- | sys/dev/asr/sys_info.h | 6 |
7 files changed, 31 insertions, 31 deletions
diff --git a/sys/dev/asr/asr.c b/sys/dev/asr/asr.c index 16aaabb..012e552 100644 --- a/sys/dev/asr/asr.c +++ b/sys/dev/asr/asr.c @@ -236,10 +236,10 @@ static dpt_sig_S ASR_sig = { #include <vm/vm.h> #include <vm/pmap.h> -#if defined (__i386__) +#if defined(__i386__) #include <i386/include/cputypes.h> #include <i386/include/vmparam.h> -#elif defined (__alpha__) +#elif defined(__alpha__) #include <alpha/include/pmap.h> #endif @@ -4485,7 +4485,7 @@ asr_ioctl( Info.numDrives = *((char *)ptok(0x475)); Info.processorFamily = ASR_sig.dsProcessorFamily; -#if defined (__i386__) +#if defined(__i386__) switch (cpu) { case CPU_386SX: case CPU_386: Info.processorType = PROC_386; break; diff --git a/sys/dev/asr/dptsig.h b/sys/dev/asr/dptsig.h index edd756e..cf61f70 100644 --- a/sys/dev/asr/dptsig.h +++ b/sys/dev/asr/dptsig.h @@ -69,7 +69,7 @@ typedef unsigned long sigLONG; /* is not checked. If using BCC, do not use the -a option. */ #ifndef NO_PACK -#if defined (_DPT_AIX) +#if defined(_DPT_AIX) #pragma options align=packed #else #pragma pack(1) @@ -449,9 +449,9 @@ typedef struct dpt_sig_Packed { /* restore it. */ #ifndef NO_UNPACK -#if defined (_DPT_AIX) +#if defined(_DPT_AIX) #pragma options align=reset -#elif defined (UNPACK_FOUR) +#elif defined(UNPACK_FOUR) #pragma pack(4) #else #pragma pack() diff --git a/sys/dev/asr/i2odep.h b/sys/dev/asr/i2odep.h index 3be3783..7041240 100644 --- a/sys/dev/asr/i2odep.h +++ b/sys/dev/asr/i2odep.h @@ -112,8 +112,8 @@ typedef U32 BF; typedef unsigned char BOOL; #endif -#if (!defined(__FAR__)) -# if (defined(__BORLANDC__)) +#if !defined(__FAR__)) +# if defined(__BORLANDC__) # define __FAR__ far # else # define __FAR__ @@ -122,12 +122,12 @@ typedef unsigned char BOOL; /* NULL */ -#if (!defined(NULL)) +#if !defined(NULL) # define NULL ((VOID __FAR__ *)0L) #endif -#if (defined(__SPARC__) || defined(__linux__)) +#if defined(__SPARC__) || defined(__linux__) typedef char CHAR; typedef char *pCHAR; typedef char INT8; diff --git a/sys/dev/asr/osd_defs.h b/sys/dev/asr/osd_defs.h index 31bd2dd..871d8f9 100644 --- a/sys/dev/asr/osd_defs.h +++ b/sys/dev/asr/osd_defs.h @@ -63,7 +63,7 @@ # define _DPT_SCO #endif -#if defined (ZIL_CURSES) +#if defined(ZIL_CURSES) #define _DPT_CURSES #else #define _DPT_MOTIF diff --git a/sys/dev/asr/osd_unix.h b/sys/dev/asr/osd_unix.h index 127c652..0b8acec 100644 --- a/sys/dev/asr/osd_unix.h +++ b/sys/dev/asr/osd_unix.h @@ -135,7 +135,7 @@ typedef struct { uCHAR Reserved3; /* Reserved Field */ } DptReadConfig_t; -#if defined ( _DPT_SOLARIS ) +#if defined(_DPT_SOLARIS) #include <sys/types.h> #include <sys/ddidmareq.h> @@ -209,7 +209,7 @@ typedef struct { /* Inform driver to reset adapter */ #define I2ORESETCMD _IO('D',78) -#elif defined (SNI_MIPS) +#elif defined(SNI_MIPS) /* Unix Ioctl Command definitions */ #define EATAUSRCMD (('D'<<8)|65) diff --git a/sys/dev/asr/osd_util.h b/sys/dev/asr/osd_util.h index 12437f9..0f2b6ea 100644 --- a/sys/dev/asr/osd_util.h +++ b/sys/dev/asr/osd_util.h @@ -108,39 +108,39 @@ /* OS dependent defines */ /*--------------------- */ -#if defined (_DPT_MSDOS) || defined (_DPT_WIN_3X) +#if defined(_DPT_MSDOS) || defined(_DPT_WIN_3X) #define _DPT_16_BIT #else #define _DPT_32_BIT #endif -#if defined (_DPT_SCO) || defined (_DPT_UNIXWARE) || defined (_DPT_SOLARIS) || defined (_DPT_AIX) || defined (SNI_MIPS) || defined (_DPT_BSDI) || defined (_DPT_FREE_BSD) || defined(_DPT_LINUX) +#if defined(_DPT_SCO) || defined(_DPT_UNIXWARE) || defined(_DPT_SOLARIS) || defined(_DPT_AIX) || defined(SNI_MIPS) || defined(_DPT_BSDI) || defined(_DPT_FREE_BSD) || defined(_DPT_LINUX) #define _DPT_UNIX #endif -#if defined (_DPT_WIN_3x) || defined (_DPT_WIN_4X) || defined (_DPT_WIN_NT) \ - || defined (_DPT_OS2) +#if defined(_DPT_WIN_3x) || defined(_DPT_WIN_4X) || defined(_DPT_WIN_NT) \ + || defined(_DPT_OS2) #define _DPT_DLL_SUPPORT #endif -#if !defined (_DPT_MSDOS) && !defined (_DPT_WIN_3X) && !defined (_DPT_NETWARE) +#if !defined(_DPT_MSDOS) && !defined(_DPT_WIN_3X) && !defined(_DPT_NETWARE) #define _DPT_PREEMPTIVE #endif -#if !defined (_DPT_MSDOS) && !defined (_DPT_WIN_3X) +#if !defined(_DPT_MSDOS) && !defined(_DPT_WIN_3X) #define _DPT_MULTI_THREADED #endif -#if !defined (_DPT_MSDOS) +#if !defined(_DPT_MSDOS) #define _DPT_MULTI_TASKING #endif /* These exist for platforms that */ /* chunk when accessing mis-aligned */ /* data */ -#if defined (SNI_MIPS) || defined (_DPT_SOLARIS) - #if defined (_DPT_BIG_ENDIAN) - #if !defined (_DPT_STRICT_ALIGN) +#if defined(SNI_MIPS) || defined(_DPT_SOLARIS) + #if defined(_DPT_BIG_ENDIAN) + #if !defined(_DPT_STRICT_ALIGN) #define _DPT_STRICT_ALIGN #endif #endif @@ -167,8 +167,8 @@ /* In the meantime, just pray that we can all move to Win32 as soon */ /* as possible... */ /*-------------------------------------------------------------------*/ -#if !defined (DPTSQO) - #if defined (_DPT_SOLARIS) +#if !defined(DPTSQO) + #if defined(_DPT_SOLARIS) #define DPTSQO #define DPTSQC #else @@ -182,7 +182,7 @@ /* OS dependent typedefs */ /*---------------------- */ -#if defined (_DPT_MSDOS) || defined (_DPT_SCO) +#if defined(_DPT_MSDOS) || defined(_DPT_SCO) #define BYTE unsigned char #define WORD unsigned short #endif @@ -201,7 +201,7 @@ } access_U; #endif -#if !defined (NULL) +#if !defined(NULL) #define NULL 0 #endif @@ -267,7 +267,7 @@ *-------------------------------------*/ uLONG netSwap4(uLONG val); -#if defined (_DPT_BIG_ENDIAN) +#if defined(_DPT_BIG_ENDIAN) /* for big-endian we need to swap */ diff --git a/sys/dev/asr/sys_info.h b/sys/dev/asr/sys_info.h index 8ae9bc3..2fa99b6 100644 --- a/sys/dev/asr/sys_info.h +++ b/sys/dev/asr/sys_info.h @@ -64,7 +64,7 @@ #endif #ifndef NO_PACK -#if defined (_DPT_AIX) +#if defined(_DPT_AIX) #pragma options align=packed #else #pragma pack(1) @@ -413,9 +413,9 @@ /* Restore default structure packing */ #ifndef NO_UNPACK -#if defined (_DPT_AIX) +#if defined(_DPT_AIX) #pragma options align=reset -#elif defined (UNPACK_FOUR) +#elif defined(UNPACK_FOUR) #pragma pack(4) #else #pragma pack() |