- Merged trunk changes 796:817 into the 0.12 branch
diff --git a/include/polarssl/camellia.h b/include/polarssl/camellia.h
index 2037e73..be8a42b 100644
--- a/include/polarssl/camellia.h
+++ b/include/polarssl/camellia.h
@@ -20,12 +20,12 @@
  */
 #ifndef POLARSSL_CAMELLIA_H
 #define POLARSSL_CAMELLIA_H
-

-#ifdef _MSC_VER

-#include <basetsd.h>

-typedef UINT32 uint32_t;

+
+#ifdef _MSC_VER
+#include <basetsd.h>
+typedef UINT32 uint32_t;
 #else
-#include <inttypes.h>

+#include <inttypes.h>
 #endif
 
 #define CAMELLIA_ENCRYPT     1