summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@oracle.com>2024-02-17 15:37:41 -0800
committerAlan Coopersmith <alan.coopersmith@oracle.com>2024-02-20 17:05:50 -0800
commit4400a68b3a5ecacd1f997d41a0572544fa8fe544 (patch)
tree57f69da6ea9d811420799cf0101089176c103d7e
parent1e56b27429667e772b15b0f39863a8467297062b (diff)
unifdef Lynx
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-rw-r--r--modules/lc/def/lcDefConv.c2
-rw-r--r--modules/lc/gen/lcGenConv.c2
-rw-r--r--src/ImUtil.c4
-rw-r--r--src/PutImage.c4
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 <stdio.h>
-#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))