wok-next annotate arj/stuff/patches/arches_align.patch @ rev 19715

Fix building: pciutils, pcmanfm-legacy, arj
author Aleksej Bobylev <al.bobylev@gmail.com>
date Sat May 13 17:25:31 2017 +0300 (2017-05-13)
parents
children
rev   line source
al@19715 1 #DPATCHLEVEL=1
al@19715 2 diff -Naur arj-3.10.19.orig/arj_proc.c arj-3.10.19/arj_proc.c
al@19715 3 --- arj-3.10.19.orig/arj_proc.c 2004-02-20 14:18:52.000000000 +0100
al@19715 4 +++ arj-3.10.22/arj_proc.c 2004-04-08 14:06:58.000000000 +0200
al@19715 5 @@ -2898,7 +2898,7 @@
al@19715 6 }
al@19715 7 #endif
al@19715 8
al@19715 9 -#if defined(WORDS_BIGENDIAN)&&!defined(ARJDISP)&&!defined(REGISTER)
al@19715 10 +#if (defined(WORDS_BIGENDIAN) || defined(ALIGN_POINTERS)) && !defined(ARJDISP) && !defined(REGISTER)
al@19715 11 /* Model-independent routine to get 2 bytes from far RAM */
al@19715 12
al@19715 13 unsigned int mget_word(char FAR *p)
al@19715 14 diff -Naur arj-3.10.19.orig/arj_proc.h arj-3.10.19/arj_proc.h
al@19715 15 --- arj-3.10.19.orig/arj_proc.h 2004-01-25 01:40:00.000000000 +0100
al@19715 16 +++ arj-3.10.22/arj_proc.h 2004-04-08 14:07:18.000000000 +0200
al@19715 17 @@ -12,7 +12,7 @@
al@19715 18
al@19715 19 #define mget_byte(p) (*(unsigned char FAR *)(p)&0xFF)
al@19715 20 #define mput_byte(c, p) *(unsigned char FAR *)(p)=(unsigned char)(c)
al@19715 21 -#ifndef WORDS_BIGENDIAN
al@19715 22 +#if !defined(ALIGN_POINTERS) && !defined(WORDS_BIGENDIAN)
al@19715 23 #define mget_word(p) (*(unsigned short *)(p)&0xFFFF)
al@19715 24 #define mput_word(w,p) (*(unsigned short *)(p)=(unsigned short)(w))
al@19715 25 #define mget_dword(p) (*(unsigned long *)(p))
al@19715 26 @@ -60,7 +60,7 @@
al@19715 27 void unpack_mem(struct mempack *mempack);
al@19715 28 void strip_lf(char *str);
al@19715 29 char *ltrim(char *str);
al@19715 30 -#ifdef WORDS_BIGENDIAN
al@19715 31 +#if defined(ALIGN_POINTERS) || defined(WORDS_BIGENDIAN)
al@19715 32 unsigned int mget_word(char FAR *p);
al@19715 33 unsigned long mget_dword(char FAR *p);
al@19715 34 void mput_word(unsigned int w, char FAR *p);