From 75ea7be5207b064a9158acba20596974f59e9370 Mon Sep 17 00:00:00 2001 From: Jon Trulson Date: Sun, 12 Dec 2021 12:29:48 -0700 Subject: [PATCH] DtSearch/raima: use autodetected byte endianness rather than forcing based on OS --- cde/lib/DtSearch/raima/Makefile.am | 8 ++++---- cde/lib/DtSearch/raima/dbswab.c | 2 +- cde/lib/DtSearch/raima/dbswab.h | 3 ++- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/cde/lib/DtSearch/raima/Makefile.am b/cde/lib/DtSearch/raima/Makefile.am index a05e57518..ae0884af0 100644 --- a/cde/lib/DtSearch/raima/Makefile.am +++ b/cde/lib/DtSearch/raima/Makefile.am @@ -5,20 +5,20 @@ noinst_LTLIBRARIES = libraima.la libraima_la_LIBADD = -lc -lm libraima_la_CFLAGS = -DCDE_INSTALLATION_TOP=\"$(CDE_INSTALLATION_TOP)\" \ - @DT_INCDIR@ \ + @DT_INCDIR@ -I$(top_srcdir)/include \ -DCDE_CONFIGURATION_TOP=\"$(CDE_CONFIGURATION_TOP)\" \ -DNO_TRANS -DUNIX -D_POSIX_SOURCE -DMULTIBYTE if LINUX -libraima_la_CFLAGS += -DBYTE_SWAP -D_XOPEN_SOURCE=700 +libraima_la_CFLAGS += -D_XOPEN_SOURCE=700 endif if BSD -libraima_la_CFLAGS += -DBYTE_SWAP -D_XOPEN_SOURCE=700 +libraima_la_CFLAGS += -D_XOPEN_SOURCE=700 endif if SOLARIS -libraima_la_CFLAGS += -DBYTE_SWAP -D_XOPEN_SOURCE=500 -DNO_REGCOMP +libraima_la_CFLAGS += -D_XOPEN_SOURCE=500 -DNO_REGCOMP endif if HPUX diff --git a/cde/lib/DtSearch/raima/dbswab.c b/cde/lib/DtSearch/raima/dbswab.c index 73a83f150..a059ba9e8 100644 --- a/cde/lib/DtSearch/raima/dbswab.c +++ b/cde/lib/DtSearch/raima/dbswab.c @@ -85,7 +85,7 @@ int debugging_key_swabs = FALSE; */ void swab_page (char *pgbuf, FILE_ENTRY *file_ptr, SWABDIR direction) { -#ifndef BYTE_SWAP +#if defined(WORDS_BIGENDIAN) return; #else INT slotno; diff --git a/cde/lib/DtSearch/raima/dbswab.h b/cde/lib/DtSearch/raima/dbswab.h index 2e8d8b229..2e53d52e7 100644 --- a/cde/lib/DtSearch/raima/dbswab.h +++ b/cde/lib/DtSearch/raima/dbswab.h @@ -68,6 +68,7 @@ #include #include +#include /* Record number for OR_MISCREC DtSearch record */ #define MISCREC_RECNO 3 @@ -80,7 +81,7 @@ typedef enum {HTON=1, NTOH} SWABDIR; extern void swab_page (char *pgbuf, FILE_ENTRY *file_ptr, SWABDIR direction); -#ifdef BYTE_SWAP /* ie (BYTE_ORDER != BIG_ENDIAN) */ +#if !defined(WORDS_BIGENDIAN) /* ie (BYTE_ORDER != BIG_ENDIAN) */ #define HTONL(x) x = htonl(x) #define HTONS(x) x = htons(x)