From 4400a68b3a5ecacd1f997d41a0572544fa8fe544 Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Sat, 17 Feb 2024 15:37:41 -0800 Subject: unifdef Lynx Signed-off-by: Alan Coopersmith --- modules/lc/def/lcDefConv.c | 2 +- modules/lc/gen/lcGenConv.c | 2 +- src/ImUtil.c | 4 ---- src/PutImage.c | 4 ---- 4 files changed, 2 insertions(+), 10 deletions(-) diff --git a/modules/lc/def/lcDefConv.c b/modules/lc/def/lcDefConv.c index 51ad2f8e..cf68344c 100644 --- a/modules/lc/def/lcDefConv.c +++ b/modules/lc/def/lcDefConv.c @@ -44,7 +44,7 @@ #define MB_LEN_MAX 6 #endif -#if !defined(Lynx_22) && !defined(X_LOCALE) +#ifndef X_LOCALE #define STDCVT #endif diff --git a/modules/lc/gen/lcGenConv.c b/modules/lc/gen/lcGenConv.c index dff4269c..e1a13a28 100644 --- a/modules/lc/gen/lcGenConv.c +++ b/modules/lc/gen/lcGenConv.c @@ -53,7 +53,7 @@ #include "XlcGeneric.h" #include -#if !defined(Lynx_22) && !defined(X_LOCALE) +#ifndef X_LOCALE #define STDCVT #endif diff --git a/src/ImUtil.c b/src/ImUtil.c index fbfad33e..bedcd095 100644 --- a/src/ImUtil.c +++ b/src/ImUtil.c @@ -239,10 +239,6 @@ static void _putbits( * */ -#if defined(Lynx) && defined(ROUNDUP) -#undef ROUNDUP -#endif - #define ROUNDUP(nbytes, pad) ((((nbytes) + ((pad)-1)) / (pad)) * ((pad)>>3)) #define XYNORMALIZE(bp, img) \ diff --git a/src/PutImage.c b/src/PutImage.c index ba411e36..40a10a50 100644 --- a/src/PutImage.c +++ b/src/PutImage.c @@ -41,10 +41,6 @@ in this Software without prior written authorization from The Open Group. #define RConst const #endif -#if defined(Lynx) && defined(ROUNDUP) -#undef ROUNDUP -#endif - /* assumes pad is a power of 2 */ #define ROUNDUP(nbytes, pad) (((nbytes) + ((pad) - 1)) & ~(long)((pad) - 1)) -- cgit v1.2.3