debian/cdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

DtSearch/raima: use autodetected byte endianness rather than forcing based on OS

Browse Source
This commit is contained in:
Jon Trulson
2021-12-12 12:29:48 -07:00
parent c479fe7b9e
commit 75ea7be520
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cde/lib/DtSearch/raima/Makefile.am
View File

@@ -5,20 +5,20 @@ noinst_LTLIBRARIES = libraima.la
libraima_la_LIBADD = -lc -lm libraima_la_LIBADD = -lc -lm
libraima_la_CFLAGS = -DCDE_INSTALLATION_TOP=\"$(CDE_INSTALLATION_TOP)\" \ libraima_la_CFLAGS = -DCDE_INSTALLATION_TOP=\"$(CDE_INSTALLATION_TOP)\" \
@DT_INCDIR@ \ @DT_INCDIR@ -I$(top_srcdir)/include \
-DCDE_CONFIGURATION_TOP=\"$(CDE_CONFIGURATION_TOP)\" \ -DCDE_CONFIGURATION_TOP=\"$(CDE_CONFIGURATION_TOP)\" \
-DNO_TRANS -DUNIX -D_POSIX_SOURCE -DMULTIBYTE -DNO_TRANS -DUNIX -D_POSIX_SOURCE -DMULTIBYTE
if LINUX if LINUX
libraima_la_CFLAGS += -DBYTE_SWAP -D_XOPEN_SOURCE=700 libraima_la_CFLAGS += -D_XOPEN_SOURCE=700
endif endif
if BSD if BSD
libraima_la_CFLAGS += -DBYTE_SWAP -D_XOPEN_SOURCE=700 libraima_la_CFLAGS += -D_XOPEN_SOURCE=700
endif endif
if SOLARIS if SOLARIS
libraima_la_CFLAGS += -DBYTE_SWAP -D_XOPEN_SOURCE=500 -DNO_REGCOMP libraima_la_CFLAGS += -D_XOPEN_SOURCE=500 -DNO_REGCOMP
endif endif
if HPUX if HPUX

2
cde/lib/DtSearch/raima/dbswab.c
View File

@@ -85,7 +85,7 @@ int debugging_key_swabs = FALSE;
*/ */
void swab_page (char *pgbuf, FILE_ENTRY *file_ptr, SWABDIR direction) void swab_page (char *pgbuf, FILE_ENTRY *file_ptr, SWABDIR direction)
{ {
#ifndef BYTE_SWAP #if defined(WORDS_BIGENDIAN)
return; return;
#else #else
INT slotno; INT slotno;

3
cde/lib/DtSearch/raima/dbswab.h
View File

@@ -68,6 +68,7 @@
#include <sys/types.h> #include <sys/types.h>
#include <netinet/in.h> #include <netinet/in.h>
#include <autotools_config.h>
/* Record number for OR_MISCREC DtSearch record */ /* Record number for OR_MISCREC DtSearch record */
#define MISCREC_RECNO 3 #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); 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 HTONL(x) x = htonl(x)
#define HTONS(x) x = htons(x) #define HTONS(x) x = htons(x)