d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Tighten up the defined()'s.

Browse Source
This commit is contained in:
David E. O'Brien 2002-05-14 21:54:56 +00:00
parent dd3a3dfc3b
commit 5d340b7ec1
7 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/dev/asr/asr.c
View File

@ -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;

6
sys/dev/asr/dptsig.h
View File

@ -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()

8
sys/dev/asr/i2odep.h
View File

@ -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;

2
sys/dev/asr/osd_defs.h
View File

@ -63,7 +63,7 @@
# define _DPT_SCO
#endif
#if defined (ZIL_CURSES)
#if defined(ZIL_CURSES)
#define _DPT_CURSES
#else
#define _DPT_MOTIF

4
sys/dev/asr/osd_unix.h
View File

@ -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)

30
sys/dev/asr/osd_util.h
View File

@ -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 */

6
sys/dev/asr/sys_info.h
View File

@ -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()