mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avoid the annoying xpdf warning about string literal conversion to error()

Browse Source 
Clang quotes it in the warning message, and tinderbox log parser highlights
every single of the warnings because of the 'error'.

Change-Id: I6a2addc6817d05d18dcc1985ecaca0b110045ecf
This commit is contained in:
Luboš Luňák
2012-10-09 23:29:42 +02:00
parent 06fb559a4b
commit 98a6d76f1e
2 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
xpdf/makefile.mk
View File

@@ -48,7 +48,7 @@ dummy:
TARFILE_NAME=xpdf-3.02
TARFILE_MD5=599dc4cc65a07ee868cf92a667a913d2
PATCH_FILES=$(TARFILE_NAME).patch xpdf-3.02-ooopwd.patch xpdf-3.02-gfxColorMaxComps.patch
PATCH_FILES=$(TARFILE_NAME).patch xpdf-3.02-ooopwd.patch xpdf-3.02-gfxColorMaxComps.patch xpdf-no-writable-literals.patch
CONFIGURE_DIR=
BUILD_DIR=$(CONFIGURE_DIR)

21
xpdf/xpdf-no-writable-literals.patch Normal file
View File

@@ -0,0 +1,21 @@
--- misc/xpdf-3.02/xpdf/Error.h.sav 2007-02-27 23:05:52.000000000 +0100
+++ misc/build/xpdf-3.02/xpdf/Error.h 2012-10-09 23:24:12.002455791 +0200
@@ -18,6 +18,6 @@
#include <stdio.h>
#include "config.h"
-extern void CDECL error(int pos, char *msg, ...);
+extern void CDECL error(int pos, const char *msg, ...);
#endif
--- misc/build/xpdf-3.02/xpdf/Error.cc.sav 2007-02-27 23:05:52.000000000 +0100
+++ misc/build/xpdf-3.02/xpdf/Error.cc 2012-10-09 23:24:27.813569809 +0200
@@ -18,7 +18,7 @@
#include "GlobalParams.h"
#include "Error.h"
-void CDECL error(int pos, char *msg, ...) {
+void CDECL error(int pos, const char *msg, ...) {
va_list args;
// NB: this can be called before the globalParams object is created