Newer
Older
Import / applications / MakePDF / 3rdParty / libharu / pr-patches / 0001-included-hpdf_objects-and-commeting-double-defs-if-H.patch
From 4ae7ac01c01db9156b91fa349c9b799f958428c7 Mon Sep 17 00:00:00 2001
From: termi3 <yordan_kyosev@gmx.net>
Date: Sun, 13 Sep 2015 23:18:02 +0200
Subject: [PATCH] included  hpdf_objects and commeting double defs if
 HPDF_SHARED

Included  #include "hpdf_objects.h"
commented type definitions, which are defined in hpdf_objects.h and couse compiler error of the samples.
---
 include/hpdf.h | 42 ++++++++++++++++++++++--------------------
 1 file changed, 22 insertions(+), 20 deletions(-)

diff --git a/include/hpdf.h b/include/hpdf.h
index 1cf0dd9..ff6422f 100644
--- a/include/hpdf.h
+++ b/include/hpdf.h
@@ -19,6 +19,7 @@
 
 #include "hpdf_config.h"
 #include "hpdf_version.h"
+#include "hpdf_objects.h"
 
 #define HPDF_UNUSED(a) ((void)(a))
 
@@ -55,28 +56,29 @@
 
 typedef void         *HPDF_HANDLE;
 typedef HPDF_HANDLE   HPDF_Doc;
-typedef HPDF_HANDLE   HPDF_Page;
-typedef HPDF_HANDLE   HPDF_Pages;
-typedef HPDF_HANDLE   HPDF_Stream;
-typedef HPDF_HANDLE   HPDF_Image;
+// following types are redefined in hpdf_objects.h and couse compiler error of the samples
+//typedef HPDF_HANDLE   HPDF_Page;
+//typedef HPDF_HANDLE   HPDF_Pages;
+//typedef HPDF_HANDLE   HPDF_Stream;
+//typedef HPDF_HANDLE   HPDF_Image;
 typedef HPDF_HANDLE   HPDF_Font;
-typedef HPDF_HANDLE   HPDF_Outline;
-typedef HPDF_HANDLE   HPDF_Encoder;
-typedef HPDF_HANDLE   HPDF_3DMeasure;
-typedef HPDF_HANDLE   HPDF_ExData;
-typedef HPDF_HANDLE   HPDF_Destination;
-typedef HPDF_HANDLE   HPDF_XObject;
-typedef HPDF_HANDLE   HPDF_Annotation;
-typedef HPDF_HANDLE   HPDF_ExtGState;
+//typedef HPDF_HANDLE   HPDF_Outline;
+//typedef HPDF_HANDLE   HPDF_Encoder;
+//typedef HPDF_HANDLE   HPDF_3DMeasure;
+//typedef HPDF_HANDLE   HPDF_ExData;
+//typedef HPDF_HANDLE   HPDF_Destination;
+//typedef HPDF_HANDLE   HPDF_XObject;
+//typedef HPDF_HANDLE   HPDF_Annotation;
+//typedef HPDF_HANDLE   HPDF_ExtGState;
 typedef HPDF_HANDLE   HPDF_FontDef;
-typedef HPDF_HANDLE   HPDF_U3D;
-typedef HPDF_HANDLE   HPDF_JavaScript;
-typedef HPDF_HANDLE   HPDF_Error;
-typedef HPDF_HANDLE   HPDF_MMgr;
-typedef HPDF_HANDLE   HPDF_Dict;
-typedef HPDF_HANDLE   HPDF_EmbeddedFile;
-typedef HPDF_HANDLE   HPDF_OutputIntent;
-typedef HPDF_HANDLE   HPDF_Xref;
+//typedef HPDF_HANDLE   HPDF_U3D;
+//typedef HPDF_HANDLE   HPDF_JavaScript;
+//typedef HPDF_HANDLE   HPDF_Error;
+//typedef HPDF_HANDLE   HPDF_MMgr;
+//typedef HPDF_HANDLE   HPDF_Dict;
+//typedef HPDF_HANDLE   HPDF_EmbeddedFile;
+//typedef HPDF_HANDLE   HPDF_OutputIntent;
+//typedef HPDF_HANDLE   HPDF_Xref;
 
 #else
 
-- 
2.21.1 (Apple Git-122.3)