wok-next diff arj/stuff/patches/arches_align.patch @ rev 21056
zim: fix build
author | Aleksej Bobylev <al.bobylev@gmail.com> |
---|---|
date | Mon Dec 03 11:57:12 2018 +0200 (2018-12-03) |
parents | |
children |
line diff
1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1.2 +++ b/arj/stuff/patches/arches_align.patch Mon Dec 03 11:57:12 2018 +0200 1.3 @@ -0,0 +1,34 @@ 1.4 +#DPATCHLEVEL=1 1.5 +diff -Naur arj-3.10.19.orig/arj_proc.c arj-3.10.19/arj_proc.c 1.6 +--- arj-3.10.19.orig/arj_proc.c 2004-02-20 14:18:52.000000000 +0100 1.7 ++++ arj-3.10.22/arj_proc.c 2004-04-08 14:06:58.000000000 +0200 1.8 +@@ -2898,7 +2898,7 @@ 1.9 + } 1.10 + #endif 1.11 + 1.12 +-#if defined(WORDS_BIGENDIAN)&&!defined(ARJDISP)&&!defined(REGISTER) 1.13 ++#if (defined(WORDS_BIGENDIAN) || defined(ALIGN_POINTERS)) && !defined(ARJDISP) && !defined(REGISTER) 1.14 + /* Model-independent routine to get 2 bytes from far RAM */ 1.15 + 1.16 + unsigned int mget_word(char FAR *p) 1.17 +diff -Naur arj-3.10.19.orig/arj_proc.h arj-3.10.19/arj_proc.h 1.18 +--- arj-3.10.19.orig/arj_proc.h 2004-01-25 01:40:00.000000000 +0100 1.19 ++++ arj-3.10.22/arj_proc.h 2004-04-08 14:07:18.000000000 +0200 1.20 +@@ -12,7 +12,7 @@ 1.21 + 1.22 + #define mget_byte(p) (*(unsigned char FAR *)(p)&0xFF) 1.23 + #define mput_byte(c, p) *(unsigned char FAR *)(p)=(unsigned char)(c) 1.24 +-#ifndef WORDS_BIGENDIAN 1.25 ++#if !defined(ALIGN_POINTERS) && !defined(WORDS_BIGENDIAN) 1.26 + #define mget_word(p) (*(unsigned short *)(p)&0xFFFF) 1.27 + #define mput_word(w,p) (*(unsigned short *)(p)=(unsigned short)(w)) 1.28 + #define mget_dword(p) (*(unsigned long *)(p)) 1.29 +@@ -60,7 +60,7 @@ 1.30 + void unpack_mem(struct mempack *mempack); 1.31 + void strip_lf(char *str); 1.32 + char *ltrim(char *str); 1.33 +-#ifdef WORDS_BIGENDIAN 1.34 ++#if defined(ALIGN_POINTERS) || defined(WORDS_BIGENDIAN) 1.35 + unsigned int mget_word(char FAR *p); 1.36 + unsigned long mget_dword(char FAR *p); 1.37 + void mput_word(unsigned int w, char FAR *p);