summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@oracle.com>2013-08-09 00:09:30 -0700
committerAlan Coopersmith <alan.coopersmith@oracle.com>2013-08-09 00:09:30 -0700
commit5a06ff257f72a629539f23b35026fbcdb8bb372e (patch)
treea4e6f7e57e0dcb224ab337532061ca9fc8933fc3
parent759bbd43f0fdc9a96ba1676d7830164bc9954be2 (diff)
downloadxorg-lib-libSM-5a06ff257f72a629539f23b35026fbcdb8bb372e.tar.gz
unifdef WORD64 (leftover bits of Cray support)
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-rw-r--r--src/SMlibint.h46
1 files changed, 0 insertions, 46 deletions
diff --git a/src/SMlibint.h b/src/SMlibint.h
index c788739..52c72e7 100644
--- a/src/SMlibint.h
+++ b/src/SMlibint.h
@@ -104,35 +104,17 @@ in this Software without prior written authorization from The Open Group.
* STORE macros
*/
-#ifndef WORD64
-
#define STORE_CARD32(_pBuf, _val) \
{ \
*((CARD32 *) _pBuf) = _val; \
_pBuf += 4; \
}
-#else /* WORD64 */
-
-#define STORE_CARD32(_pBuf, _val) \
-{ \
- struct { \
- int value :32; \
- } _d; \
- _d.value = _val; \
- memcpy (_pBuf, &_d, 4); \
- _pBuf += 4; \
-}
-
-#endif /* WORD64 */
-
/*
* EXTRACT macros
*/
-#ifndef WORD64
-
#define EXTRACT_CARD16(_pBuf, _swap, _val) \
{ \
_val = *((CARD16 *) _pBuf); \
@@ -149,34 +131,6 @@ in this Software without prior written authorization from The Open Group.
_val = lswapl (_val); \
}
-#else /* WORD64 */
-
-#define EXTRACT_CARD16(_pBuf, _swap, _val) \
-{ \
- _val = *(_pBuf + 0) & 0xff; /* 0xff incase _pBuf is signed */ \
- _val <<= 8; \
- _val |= *(_pBuf + 1) & 0xff;\
- _pBuf += 2; \
- if (_swap) \
- _val = lswaps (_val); \
-}
-
-#define EXTRACT_CARD32(_pBuf, _swap, _val) \
-{ \
- _val = *(_pBuf + 0) & 0xff; /* 0xff incase _pBuf is signed */ \
- _val <<= 8; \
- _val |= *(_pBuf + 1) & 0xff;\
- _val <<= 8; \
- _val |= *(_pBuf + 2) & 0xff;\
- _val <<= 8; \
- _val |= *(_pBuf + 3) & 0xff;\
- _pBuf += 4; \
- if (_swap) \
- _val = lswapl (_val); \
-}
-
-#endif /* WORD64 */
-
/*
* Compute the number of bytes for a LISTofPROPERTY representation