From 243af7389f1deaf4cf74144e89fd93003e476963 Mon Sep 17 00:00:00 2001
From: Xavier Roche <xroche@users.noreply.github.com>
Date: Mon, 7 May 2012 10:09:24 +0000
Subject: Fixed includes.

---
 src/htscharset.c | 6 ++----
 src/htscharset.h | 7 +++++++
 2 files changed, 9 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/htscharset.c b/src/htscharset.c
index 1c21590..88d1ea1 100644
--- a/src/htscharset.c
+++ b/src/htscharset.c
@@ -34,6 +34,8 @@ Please visit our Website: http://www.httrack.com
 /* Author: Xavier Roche                                         */
 /* ------------------------------------------------------------ */
 
+#include "htscharset.h"
+
 int hts_isStringAscii(const char *s, size_t size) {
   size_t i;
   for(i = 0 ; i < size ; i++) {
@@ -47,9 +49,6 @@ int hts_isStringAscii(const char *s, size_t size) {
 
 #ifdef _WIN32
 
-#include <windows.h>
-#include <string.h>
-
 typedef struct wincodepage_t wincodepage_t;
 struct wincodepage_t {
   UINT codepage;
@@ -352,7 +351,6 @@ char *hts_convertStringSystemToUTF8(const char *s, size_t size) {
 
 #else
 
-#include <string.h>
 #include <errno.h>
 #include <iconv.h>
 
diff --git a/src/htscharset.h b/src/htscharset.h
index 2d76b3c..f8f4ca6 100644
--- a/src/htscharset.h
+++ b/src/htscharset.h
@@ -37,6 +37,13 @@ Please visit our Website: http://www.httrack.com
 #ifndef HTS_CHARSET_DEFH
 #define HTS_CHARSET_DEFH
 
+/** Standard includes. **/
+#include <stdlib.h>
+#include <string.h>
+#ifdef _WIN32
+#include <windows.h>
+#endif
+
 /**
  * Convert the string "s" from charset "charset" to UTF-8.
  * Return NULL upon error.
-- 
cgit v1.2.3