增加HGInc.h头文件

base/HGBase64.cpp

 #include "HGBase64.h"
+#include "HGInc.h"
 
 HGResult HGAPI HGBase_Base64Encode(const HGByte* originalData, HGSize originalSize,
 	HGByte* base64Data, HGSize* base64Size)

base/HGBuffer.cpp

 #include "HGBuffer.h"
+#include "HGInc.h"
 
 struct HGBufferImpl
 {

base/HGDef.h

@@ -41,42 +41,8 @@
 #if defined(HG_CMP_MSC)
 	#define WIN32_LEAN_AND_MEAN
 	#define _CRT_SECURE_NO_WARNINGS
-	#include <windows.h>
-	#include <WinSock2.h>
-#elif defined(HG_CMP_XCODE)
-
-#elif defined(HG_CMP_GNU)
-    #include <iconv.h>
-    #include <stdarg.h>
-	#include <unistd.h>
-	#include <errno.h>
-	#include <fcntl.h>
-	#include <linux/videodev2.h>
-	#include <linux/soundcard.h>
-	#include <sys/ioctl.h>
-	#include <sys/mman.h>
-	#include <sys/stat.h>
-	#include <sys/types.h>
-	#include <sys/socket.h>
-	#include <linux/netlink.h>
-	#include <arpa/inet.h>
-    #include <netinet/in.h>
-    #include <sys/statfs.h>
-	#include <pthread.h>
-	#include <dlfcn.h>
 #endif
 
-#include <stddef.h>
-#include <stdint.h>
-#include <assert.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <sys/timeb.h>
-#include <time.h>
-#include <string.h>
-#include <math.h>
-#include <setjmp.h>
-
 /* type defines */
 typedef char HGChar;
 typedef unsigned char HGByte;

base/HGDes.cpp

 #include "HGDes.h"
+#include "HGInc.h"
 
 /* 初始置换表IP */
 static HGByte IP_Table[64] =

base/HGDll.cpp

 #include "HGDll.h"
+#include "HGInc.h"
+#if !defined(HG_CMP_MSC)
+#include <dlfcn.h>
+#endif
 
 struct HGDllImpl
 {

base/HGEvent.cpp

 #include "HGEvent.h"
+#include "HGInc.h"
 
 #if !defined(HG_CMP_MSC)
 typedef struct

base/HGImage.cpp

 #include "HGImage.h"
+#include "HGInc.h"
 #if defined(HG_CMP_MSC)
 #include <combaseapi.h>
 #include <gdiplus.h>

base/HGImage.h

@@ -3,6 +3,9 @@
 
 #include "HGDef.h"
 #include "HGBaseErr.h"
+#if defined(HG_CMP_MSC)
+#include <windows.h>
+#endif
 
 HG_DECLARE_HANDLE(HGImage);
 

base/HGInc.h

+#ifndef __HGINC_H__
+#define __HGINC_H__
+
+#include <stddef.h>
+#include <stdint.h>
+#include <assert.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <sys/timeb.h>
+#include <time.h>
+#include <string.h>
+#include <math.h>
+#include <setjmp.h>
+#include <malloc.h>
+
+#if defined(HG_CMP_MSC)
+#include <windows.h>
+#endif
+
+#endif /* __HGINC_H__ */
\ No newline at end of file

base/HGLock.cpp

 #include "HGLock.h"
+#include "HGInc.h"
 
 HGResult HGAPI HGBase_CreateLock(HGLock* lock)
 {

base/HGLog.cpp

 #include "HGLog.h"
+#include "HGInc.h"
 
 struct HGLogImpl
 {

base/HGMd5.cpp

 #include "HGMd5.h"
+#include "HGInc.h"
 
 /* Constants for MD5Transform routine. */
 /* md5转换用到的常量，算法本身规定的 */

base/HGThread.cpp

 #include "HGThread.h"
+#include "HGInc.h"
+#if !defined(HG_CMP_MSC)
+#include <pthread.h>
+#endif
 
 struct HGThreadImpl
 {

base/HGUtility.cpp

 #include "HGUtility.h"
-#if !defined(HG_CMP_MSC)
-#include <uuid/uuid.h>
+#include "HGInc.h"
+#if defined(HG_CMP_MSC)
+#include <shlobj.h>
 #else
-#include <Shlobj.h>
-#include <objbase.h>
+#include <uuid/uuid.h>
 #endif
 
 HGResult HGAPI HGBase_GetTmpPath(HGChar* path, HGUInt maxLen)

build/windows/HGBase/HGBase.vcxproj

@@ -39,6 +39,7 @@
     <ClInclude Include="..\..\..\base\HGBase.h" />
     <ClInclude Include="..\..\..\base\HGBase64.h" />
     <ClInclude Include="..\..\..\base\HGBaseErr.h" />
+    <ClInclude Include="..\..\..\base\HGInc.h" />
     <ClInclude Include="..\..\..\base\HGBuffer.h" />
     <ClInclude Include="..\..\..\base\HGDef.h" />
     <ClInclude Include="..\..\..\base\HGDes.h" />

imgfmt/HGBmp.cpp

 #include "HGBmp.h"
+#include "../base/HGInc.h"
 extern "C"
 {
 #include "libnsbmp.h"

imgfmt/HGImgFmt.cpp

@@ -5,6 +5,7 @@
 #include "HGTiff.h"
 #include "HGPdf.h"
 #include "HGOfd.h"
+#include "../base/HGInc.h"
 #include <string>
 
 struct HGImgFmtReaderImpl

imgfmt/HGJpeg.cpp

 #include "HGJpeg.h"
+#include "../base/HGInc.h"
 extern "C"
 {
 #include "jpeglib.h"

imgfmt/HGOfdImpl.cpp

 #include "HGOfdImpl.hpp"
+#include "../base/HGInc.h"
 #include "../base/HGUtility.h"
 
 #define A4page_page_PhysicalBox "0.000000 0.000000 197.273333 139.022667"

imgfmt/HGPdf.cpp

 #include "HGPdf.h"
+#include "../base/HGInc.h"
 #include "mupdf/pdf.h"
 #include "mupdf/fitz.h"
 #include "pdflib.h"

imgfmt/HGPng.cpp

 #include "HGPng.h"
+#include "../base/HGInc.h"
 #include "png.h"
 #include "pngstruct.h"
 #include "pnginfo.h"

imgfmt/HGTiff.cpp

 #include "HGTiff.h"
+#include "../base/HGInc.h"
 #include "tiffio.h"
 
 HGResult HGAPI HGImgFmt_CheckTiffFile(const HGChar* fileName, HGBool* isTiff)

release/include/base/HGDef.h

@@ -41,22 +41,8 @@
 #if defined(HG_CMP_MSC)
 	#define WIN32_LEAN_AND_MEAN
 	#define _CRT_SECURE_NO_WARNINGS
-	#include <windows.h>
-#elif defined(HG_CMP_XCODE)
-	
-#elif defined(HG_CMP_GNU)
-	
 #endif
 
-#include <stdio.h>
-#include <sys/timeb.h>
-#include <time.h>
-#include <malloc.h>
-#include <assert.h>
-#include <math.h>
-#include <stdint.h>
-#include <setjmp.h>
-
 /* type defines */
 typedef char HGChar;
 typedef unsigned char HGByte;
@@ -128,4 +114,4 @@ typedef struct
 	HGFloat y;
 }HGPointF;
 
-#endif /* __HGDEF_H__ */
\ No newline at end of file
+#endif /* __HGDEF_H__ */

release/include/base/HGImage.h

@@ -3,6 +3,9 @@
 
 #include "HGDef.h"
 #include "HGBaseErr.h"
+#if defined(HG_CMP_MSC)
+#include <windows.h>
+#endif
 
 HG_DECLARE_HANDLE(HGImage);
 

release/include/base/HGInc.h

+#ifndef __HGINC_H__
+#define __HGINC_H__
+
+#include <stddef.h>
+#include <stdint.h>
+#include <assert.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <sys/timeb.h>
+#include <time.h>
+#include <string.h>
+#include <math.h>
+#include <setjmp.h>
+#include <malloc.h>
+
+#if defined(HG_CMP_MSC)
+#include <windows.h>
+#endif
+
+#endif /* __HGINC_H__ */
\ No newline at end of file

twain_user/HGTwainImpl.cpp

 #include "HGTwainImpl.hpp"
+#include "../base/HGInc.h"
 
 HGTwainImpl::HGTwainImpl()
 {