From 8719833a6a4242880ad8b81cb8fe19e03667af52 Mon Sep 17 00:00:00 2001
From: Sebastian Rasmussen <sebras@gmail.com>
Date: Fri, 14 Jun 2019 15:09:12 +0200
Subject: jbig2dec: Avoid duplicate declarations of Huffman tables in test
 code.

This is done by moving the tables into a separate compilation module and
declaring the tables extern in the header file that is used elsewhere.
---
 windows/ghostscript.vcproj     | 4 ++++
 windows/ghostscript_rt.vcxproj | 1 +
 2 files changed, 5 insertions(+)

(limited to 'windows')

diff --git a/windows/ghostscript.vcproj b/windows/ghostscript.vcproj
index efc15b9c8..71ba467b5 100644
--- a/windows/ghostscript.vcproj
+++ b/windows/ghostscript.vcproj
@@ -6939,6 +6939,10 @@
 				RelativePath="..\jbig2dec\jbig2_huffman.h"
 				>
 			</File>
+			<File
+				RelativePath="..\jbig2dec\jbig2_hufftab.c"
+				>
+			</File>
 			<File
 				RelativePath="..\jbig2dec\jbig2_hufftab.h"
 				>
diff --git a/windows/ghostscript_rt.vcxproj b/windows/ghostscript_rt.vcxproj
index fca736b4b..41a344372 100644
--- a/windows/ghostscript_rt.vcxproj
+++ b/windows/ghostscript_rt.vcxproj
@@ -1028,6 +1028,7 @@
     <ClCompile Include="..\jbig2dec\jbig2_arith_int.c" />
     <ClCompile Include="..\jbig2dec\jbig2_generic.c" />
     <ClCompile Include="..\jbig2dec\jbig2_huffman.c" />
+    <ClCompile Include="..\jbig2dec\jbig2_hufftab.c" />
     <ClCompile Include="..\jbig2dec\jbig2_image.c" />
     <ClCompile Include="..\jbig2dec\jbig2_image_pbm.c" />
     <ClCompile Include="..\jbig2dec\jbig2_image_png.c" />
-- 
cgit v1.2.1