diff options
author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2014-11-05 17:41:24 -0800 |
---|---|---|
committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2014-11-05 17:41:24 -0800 |
commit | 3b33588117c2ca3099b999939985ffe098d479b3 (patch) | |
tree | 9db307db96c2fd76646d4e1bb0ba8809811c8baf /src | |
parent | 03c035b061a0582159467dcadfc8e95074e2a84f (diff) |
Use 'imdent' to realign cpp indentation levels in fslibos.h
Parts were indented, others weren't, now is more consistent.
'git diff -w' shows no non-whitespace changes in this commit
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/fc/fslibos.h | 218 |
1 files changed, 109 insertions, 109 deletions
diff --git a/src/fc/fslibos.h b/src/fc/fslibos.h index 36eb879..1ef362d 100644 --- a/src/fc/fslibos.h +++ b/src/fc/fslibos.h @@ -43,174 +43,174 @@ from The Open Group. * makedepend screws up on #undef OPEN_MAX, so we define a new symbol */ -#ifndef FONT_OPEN_MAX - -# ifdef _POSIX_SOURCE -# include <limits.h> -# else -# define _POSIX_SOURCE -# include <limits.h> -# undef _POSIX_SOURCE -# endif -#ifndef SIZE_MAX -# ifdef ULONG_MAX -# define SIZE_MAX ULONG_MAX +# ifndef FONT_OPEN_MAX + +# ifdef _POSIX_SOURCE +# include <limits.h> +# else +# define _POSIX_SOURCE +# include <limits.h> +# undef _POSIX_SOURCE +# endif +# ifndef SIZE_MAX +# ifdef ULONG_MAX +# define SIZE_MAX ULONG_MAX +# else +# define SIZE_MAX UINT_MAX +# endif +# endif +# ifndef OPEN_MAX +# if defined(SVR4) +# define OPEN_MAX 256 +# else +# include <sys/param.h> +# ifndef OPEN_MAX +# ifdef __OSF1__ +# define OPEN_MAX 256 +# else +# ifdef NOFILE +# define OPEN_MAX NOFILE +# else +# define OPEN_MAX NOFILES_MAX +# endif +# endif +# endif +# endif +# endif + +# if OPEN_MAX > 256 +# define FONT_OPEN_MAX 256 +# else +# define FONT_OPEN_MAX OPEN_MAX +# endif + +# endif /* FONT_OPEN_MAX */ + +# ifdef WORD64 +# define NMSKBITS 64 # else -# define SIZE_MAX UINT_MAX +# define NMSKBITS 32 # endif -#endif -#ifndef OPEN_MAX -#if defined(SVR4) -#define OPEN_MAX 256 -#else -#include <sys/param.h> -#ifndef OPEN_MAX -#ifdef __OSF1__ -#define OPEN_MAX 256 -#else -#ifdef NOFILE -#define OPEN_MAX NOFILE -#else -#define OPEN_MAX NOFILES_MAX -#endif -#endif -#endif -#endif -#endif - -#if OPEN_MAX > 256 -#define FONT_OPEN_MAX 256 -#else -#define FONT_OPEN_MAX OPEN_MAX -#endif -#endif /* FONT_OPEN_MAX */ - -#ifdef WORD64 -#define NMSKBITS 64 -#else -#define NMSKBITS 32 -#endif - -#define MSKCNT ((FONT_OPEN_MAX + NMSKBITS - 1) / NMSKBITS) +# define MSKCNT ((FONT_OPEN_MAX + NMSKBITS - 1) / NMSKBITS) typedef unsigned long FdSet[MSKCNT]; typedef FdSet FdSetPtr; -#if (MSKCNT==1) -#define BITMASK(i) (1 << (i)) -#define MASKIDX(i) 0 -#endif +# if (MSKCNT==1) +# define BITMASK(i) (1 << (i)) +# define MASKIDX(i) 0 +# endif -#if (MSKCNT>1) -#define BITMASK(i) (1 << ((i) & (NMSKBITS - 1))) -#define MASKIDX(i) ((i) / NMSKBITS) -#endif +# if (MSKCNT>1) +# define BITMASK(i) (1 << ((i) & (NMSKBITS - 1))) +# define MASKIDX(i) ((i) / NMSKBITS) +# endif -#define MASKWORD(buf, i) buf[MASKIDX(i)] -#define BITSET(buf, i) MASKWORD(buf, i) |= BITMASK(i) -#define BITCLEAR(buf, i) MASKWORD(buf, i) &= ~BITMASK(i) -#define GETBIT(buf, i) (MASKWORD(buf, i) & BITMASK(i)) - -#if (MSKCNT==1) -#define COPYBITS(src, dst) dst[0] = src[0] -#define CLEARBITS(buf) buf[0] = 0 -#define MASKANDSETBITS(dst, b1, b2) dst[0] = (b1[0] & b2[0]) -#define ORBITS(dst, b1, b2) dst[0] = (b1[0] | b2[0]) -#define UNSETBITS(dst, b1) (dst[0] &= ~b1[0]) -#define ANYSET(src) (src[0]) -#endif +# define MASKWORD(buf, i) buf[MASKIDX(i)] +# define BITSET(buf, i) MASKWORD(buf, i) |= BITMASK(i) +# define BITCLEAR(buf, i) MASKWORD(buf, i) &= ~BITMASK(i) +# define GETBIT(buf, i) (MASKWORD(buf, i) & BITMASK(i)) + +# if (MSKCNT==1) +# define COPYBITS(src, dst) dst[0] = src[0] +# define CLEARBITS(buf) buf[0] = 0 +# define MASKANDSETBITS(dst, b1, b2) dst[0] = (b1[0] & b2[0]) +# define ORBITS(dst, b1, b2) dst[0] = (b1[0] | b2[0]) +# define UNSETBITS(dst, b1) (dst[0] &= ~b1[0]) +# define ANYSET(src) (src[0]) +# endif -#if (MSKCNT==2) -#define COPYBITS(src, dst) { dst[0] = src[0]; dst[1] = src[1]; } -#define CLEARBITS(buf) { buf[0] = 0; buf[1] = 0; } -#define MASKANDSETBITS(dst, b1, b2) {\ +# if (MSKCNT==2) +# define COPYBITS(src, dst) { dst[0] = src[0]; dst[1] = src[1]; } +# define CLEARBITS(buf) { buf[0] = 0; buf[1] = 0; } +# define MASKANDSETBITS(dst, b1, b2) {\ dst[0] = (b1[0] & b2[0]);\ dst[1] = (b1[1] & b2[1]); } -#define ORBITS(dst, b1, b2) {\ +# define ORBITS(dst, b1, b2) {\ dst[0] = (b1[0] | b2[0]);\ dst[1] = (b1[1] | b2[1]); } -#define UNSETBITS(dst, b1) {\ +# define UNSETBITS(dst, b1) {\ dst[0] &= ~b1[0]; \ dst[1] &= ~b1[1]; } -#define ANYSET(src) (src[0] || src[1]) -#endif +# define ANYSET(src) (src[0] || src[1]) +# endif -#if (MSKCNT==3) -#define COPYBITS(src, dst) { dst[0] = src[0]; dst[1] = src[1]; \ +# if (MSKCNT==3) +# define COPYBITS(src, dst) { dst[0] = src[0]; dst[1] = src[1]; \ dst[2] = src[2]; } -#define CLEARBITS(buf) { buf[0] = 0; buf[1] = 0; buf[2] = 0; } -#define MASKANDSETBITS(dst, b1, b2) {\ +# define CLEARBITS(buf) { buf[0] = 0; buf[1] = 0; buf[2] = 0; } +# define MASKANDSETBITS(dst, b1, b2) {\ dst[0] = (b1[0] & b2[0]);\ dst[1] = (b1[1] & b2[1]);\ dst[2] = (b1[2] & b2[2]); } -#define ORBITS(dst, b1, b2) {\ +# define ORBITS(dst, b1, b2) {\ dst[0] = (b1[0] | b2[0]);\ dst[1] = (b1[1] | b2[1]);\ dst[2] = (b1[2] | b2[2]); } -#define UNSETBITS(dst, b1) {\ +# define UNSETBITS(dst, b1) {\ dst[0] &= ~b1[0]; \ dst[1] &= ~b1[1]; \ dst[2] &= ~b1[2]; } -#define ANYSET(src) (src[0] || src[1] || src[2]) -#endif +# define ANYSET(src) (src[0] || src[1] || src[2]) +# endif -#if (MSKCNT==4) -#define COPYBITS(src, dst) dst[0] = src[0]; dst[1] = src[1]; \ +# if (MSKCNT==4) +# define COPYBITS(src, dst) dst[0] = src[0]; dst[1] = src[1]; \ dst[2] = src[2]; dst[3] = src[3] -#define CLEARBITS(buf) buf[0] = 0; buf[1] = 0; buf[2] = 0; buf[3] = 0 -#define MASKANDSETBITS(dst, b1, b2) \ +# define CLEARBITS(buf) buf[0] = 0; buf[1] = 0; buf[2] = 0; buf[3] = 0 +# define MASKANDSETBITS(dst, b1, b2) \ dst[0] = (b1[0] & b2[0]);\ dst[1] = (b1[1] & b2[1]);\ dst[2] = (b1[2] & b2[2]);\ dst[3] = (b1[3] & b2[3]) -#define ORBITS(dst, b1, b2) \ +# define ORBITS(dst, b1, b2) \ dst[0] = (b1[0] | b2[0]);\ dst[1] = (b1[1] | b2[1]);\ dst[2] = (b1[2] | b2[2]);\ dst[3] = (b1[3] | b2[3]) -#define UNSETBITS(dst, b1) \ +# define UNSETBITS(dst, b1) \ dst[0] &= ~b1[0]; \ dst[1] &= ~b1[1]; \ dst[2] &= ~b1[2]; \ dst[3] &= ~b1[3] -#define ANYSET(src) (src[0] || src[1] || src[2] || src[3]) -#endif +# define ANYSET(src) (src[0] || src[1] || src[2] || src[3]) +# endif -#if (MSKCNT>4) -#define COPYBITS(src, dst) memmove((caddr_t) dst, (caddr_t) src,\ +# if (MSKCNT>4) +# define COPYBITS(src, dst) memmove((caddr_t) dst, (caddr_t) src,\ MSKCNT*sizeof(long)) -#define CLEARBITS(buf) bzero((caddr_t) buf, MSKCNT*sizeof(long)) -#define MASKANDSETBITS(dst, b1, b2) \ +# define CLEARBITS(buf) bzero((caddr_t) buf, MSKCNT*sizeof(long)) +# define MASKANDSETBITS(dst, b1, b2) \ { int cri; \ for (cri=MSKCNT; --cri>=0; ) \ dst[cri] = (b1[cri] & b2[cri]); } -#define ORBITS(dst, b1, b2) \ +# define ORBITS(dst, b1, b2) \ { int cri; \ for (cri=MSKCNT; --cri>=0; ) \ dst[cri] = (b1[cri] | b2[cri]); } -#define UNSETBITS(dst, b1) \ +# define UNSETBITS(dst, b1) \ { int cri; \ for (cri=MSKCNT; --cri>=0; ) \ dst[cri] &= ~b1[cri]; } -#if (MSKCNT==8) -#define ANYSET(src) (src[0] || src[1] || src[2] || src[3] || \ +# if (MSKCNT==8) +# define ANYSET(src) (src[0] || src[1] || src[2] || src[3] || \ src[4] || src[5] || src[6] || src[7]) -#endif -#endif +# endif +# endif #else /* not WIN32 */ -#include <X11/Xwinsock.h> -#include <X11/Xw32defs.h> +# include <X11/Xwinsock.h> +# include <X11/Xw32defs.h> typedef fd_set FdSet; typedef FdSet *FdSetPtr; -#define CLEARBITS(set) FD_ZERO(&set) -#define BITSET(set,s) FD_SET(s,&set) -#define BITCLEAR(set,s) FD_CLR(s,&set) -#define GETBIT(set,s) FD_ISSET(s,&set) -#define ANYSET(set) set->fd_count +# define CLEARBITS(set) FD_ZERO(&set) +# define BITSET(set,s) FD_SET(s,&set) +# define BITCLEAR(set,s) FD_CLR(s,&set) +# define GETBIT(set,s) FD_ISSET(s,&set) +# define ANYSET(set) set->fd_count #endif |