+ Public include directories moved to "include" directory

7 files changed, 8 insertions, 8 deletions

diff --git a/src/SBaseDumpData.cpp b/src/SBaseDumpData.cpp
index 10f6256..f0b20e0 100644
--- a/src/SBaseDumpData.cpp
+++ b/src/SBaseDumpData.cpp
@@ -8,7 +8,7 @@
 /* 26.01.11  1.00  Lad  The first version of SBaseDumpData.cpp               */
 /*****************************************************************************/
 
-#define __STORMLIB_SELF__
+#define __STORMLIB_NO_AUTO_LINK__
 #include <StormLib.h>
 #include "StormCommon.h"
 
diff --git a/src/adpcm/adpcm.cpp b/src/adpcm/adpcm.cpp
index 7c6f48a..e551bda 100644
--- a/src/adpcm/adpcm.cpp
+++ b/src/adpcm/adpcm.cpp
@@ -13,7 +13,8 @@
 /* 10.01.13  3.00  Lad  Refactored, beautified, documented :-)               */
 /*****************************************************************************/
 
-#include <StormPort.h>
+#include <stddef.h>
+
 #include "adpcm.h"
 
 //-----------------------------------------------------------------------------
diff --git a/src/huffman/huff.cpp b/src/huffman/huff.cpp
index d2552a0..877a294 100644
--- a/src/huffman/huff.cpp
+++ b/src/huffman/huff.cpp
@@ -19,7 +19,6 @@
 #include <assert.h>
 #include <string.h>
  
-#include <StormPort.h>
 #include "huff.h"
 
 //-----------------------------------------------------------------------------
diff --git a/src/libtomcrypt/src/headers/tomcrypt.h b/src/libtomcrypt/src/headers/tomcrypt.h
index 74cdff4..7df3f5a 100644
--- a/src/libtomcrypt/src/headers/tomcrypt.h
+++ b/src/libtomcrypt/src/headers/tomcrypt.h
@@ -25,6 +25,10 @@ extern "C" {
 /* descriptor table size */
 #define TAB_SIZE      32
 
+#ifdef _MSC_VER
+#pragma warning(disable: 4333)		// der_encode_utf8_string.c(91) : warning C4333: '>>' : right shift by too large amount, data loss
+#endif
+
 /* error codes [will be expanded in future releases] */
 enum {
    CRYPT_OK=0,             /* Result OK */
diff --git a/src/libtomcrypt/src/pk/asn1/der_encode_setof.c b/src/libtomcrypt/src/pk/asn1/der_encode_setof.c
index ad7b0f6..b4e97b5 100644
--- a/src/libtomcrypt/src/pk/asn1/der_encode_setof.c
+++ b/src/libtomcrypt/src/pk/asn1/der_encode_setof.c
@@ -102,7 +102,7 @@ int der_encode_setof(ltc_asn1_list *list, unsigned long inlen,
       }
       
       /* get the size of the static header */
-      hdrlen = ((unsigned long)ptr) - ((unsigned long)buf);
+      hdrlen = (unsigned long)((size_t)ptr - (size_t)buf);
       
       
    /* scan for edges */
diff --git a/src/pklib/pklib.h b/src/pklib/pklib.h
index 56508f1..9eb2915 100644
--- a/src/pklib/pklib.h
+++ b/src/pklib/pklib.h
@@ -11,8 +11,6 @@
 #ifndef __PKLIB_H__
 #define __PKLIB_H__
 
-#include <StormPort.h>
-
 //-----------------------------------------------------------------------------
 // Defines
 
diff --git a/src/sparse/sparse.h b/src/sparse/sparse.h
index eb996e1..12f62b5 100644
--- a/src/sparse/sparse.h
+++ b/src/sparse/sparse.h
@@ -11,8 +11,6 @@
 #ifndef __SPARSE_H__
 #define __SPARSE_H__
 
-#include <StormPort.h>
-
 void CompressSparse(void * pvOutBuffer, int * pcbOutBuffer, void * pvInBuffer, int cbInBuffer);
 int  DecompressSparse(void * pvOutBuffer, int * pcbOutBuffer, void * pvInBuffer, int cbInBuffer);