[evince] unarr: Fix build on s390x
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evince] unarr: Fix build on s390x
- Date: Mon, 4 Sep 2017 14:22:02 +0000 (UTC)
commit 0e700196e883c1d6d7b2fdc252c74cde7087dbe9
Author: Florian Weimer <fweimer redhat com>
Date: Mon Jul 31 14:46:49 2017 +0200
unarr: Fix build on s390x
On some big-endian arches (where MY_CPU_NAME doesn't get set),
there is a preprocessor syntax error. It results in build failures
like this:
In file included from rar/../lzmasdk/Ppmd.h:8:0,
from rar/../lzmasdk/Ppmd7.h:12,
from rar/rar.h:10,
from rar/rar.c:4:
rar/../lzmasdk/CpuArch.h:177:18: error: #elif with no expression
#elif MY_CPU_BE
^
In file included from rar/../lzmasdk/Ppmd.h:8:0,
from rar/../lzmasdk/Ppmd7.h:12,
from rar/rar.h:10,
from rar/uncompress-rar.c:7:
rar/../lzmasdk/CpuArch.h:177:18: error: #elif with no expression
#elif MY_CPU_BE
^
With help from Iain Lane <iain orangesquash org uk>
See https://sourceforge.net/p/sevenzip/patches/317/
https://bugzilla.gnome.org/show_bug.cgi?id=787248
cut-n-paste/unarr/lzmasdk/CpuArch.h | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/cut-n-paste/unarr/lzmasdk/CpuArch.h b/cut-n-paste/unarr/lzmasdk/CpuArch.h
index afb6b67..e26bc78 100644
--- a/cut-n-paste/unarr/lzmasdk/CpuArch.h
+++ b/cut-n-paste/unarr/lzmasdk/CpuArch.h
@@ -174,7 +174,7 @@ MY_CPU_LE_UNALIGN means that CPU is LITTLE ENDIAN and CPU supports unaligned mem
#ifndef MY_CPU_NAME
#ifdef MY_CPU_LE
#define MY_CPU_NAME "LE"
- #elif MY_CPU_BE
+ #elif defined (MY_CPU_BE)
#define MY_CPU_NAME "BE"
#else
/*
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]