Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 1 | From 9ca6f795409b988d38dd98bc2a6ecb68a9392312 Mon Sep 17 00:00:00 2001 |
| 2 | From: Hongxu Jia <hongxu.jia@windriver.com> |
| 3 | Date: Thu, 29 Mar 2018 16:37:40 +0800 |
| 4 | Subject: [PATCH 10/10] base/genht.c: add a preprocessor define to allow fopen |
| 5 | calling |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 6 | |
| 7 | The commit in upstream: |
| 8 | http://git.ghostscript.com/?p=ghostpdl.git;a=commitdiff;h=773c69e46e70bdd5482676437dafd2ca83397643 |
| 9 | |
| 10 | Replace all fopen calls with gp_fopen and add a preprocessor define so |
| 11 | that any unintential calls directly to fopen will cause an error. |
| 12 | |
| 13 | Only exceptions are those in the platform specific code, and mkromfs.c. |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 14 | This patch add a preprocessor define to allow fopen calling in |
| 15 | base/genht.c. |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 16 | |
| 17 | Upstream-Status: Pending |
| 18 | |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 19 | Rebase to 9.23 |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 20 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> |
| 21 | --- |
| 22 | base/genht.c | 4 ++++ |
| 23 | 1 file changed, 4 insertions(+) |
| 24 | |
| 25 | diff --git a/base/genht.c b/base/genht.c |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 26 | index e597e72..e96bfb5 100644 |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 27 | --- a/base/genht.c |
| 28 | +++ b/base/genht.c |
| 29 | @@ -16,6 +16,10 @@ |
| 30 | |
| 31 | /* Generate C code for compiling halftones into ROM. */ |
| 32 | #include "malloc_.h" |
| 33 | + |
| 34 | +/* prevent gp.h from defining fopen */ |
| 35 | +#define fopen fopen |
| 36 | + |
| 37 | #include "stdio_.h" |
| 38 | #include "string_.h" |
| 39 | #include "gscdefs.h" |
| 40 | -- |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 41 | 1.8.3.1 |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 42 | |