[commit: ghc] master: stg/Types.h: Fix comment and #include (3ca7806)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/3ca78062968f7ab6efff82122101e6f91b8c2cef/ghc

>---------------------------------------------------------------

commit 3ca78062968f7ab6efff82122101e6f91b8c2cef
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Tue May 10 08:51:25 2016 +0200

    stg/Types.h: Fix comment and #include


>---------------------------------------------------------------

3ca78062968f7ab6efff82122101e6f91b8c2cef
 includes/stg/Types.h | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/includes/stg/Types.h b/includes/stg/Types.h
index 48201b1..1a61c8b 100644
--- a/includes/stg/Types.h
+++ b/includes/stg/Types.h
@@ -25,10 +25,12 @@
  * "C++ implementations should define these macros only when
  * __STDC_LIMIT_MACROS is defined before <stdint.h> is included."
  *
- * C++11 does not require it anymore. Remove once we upgrade to C++11 or newer.
+ * So we need to define it for now to compile with C++ compilers.
+ * However, C++11 does not require it anymore so we can remove this once we
+ * upgrade to requiring C++11 or newer.
  */
 #define __STDC_LIMIT_MACROS
-#import <inttypes.h>
+#include <inttypes.h>
 
 
 /*
@@ -122,7 +124,7 @@ typedef int32_t            StgInt;
 typedef uint32_t           StgWord;
 
 typedef int16_t            StgHalfInt;
-typedef uint16_s           StgHalfWord;
+typedef uint16_t           StgHalfWord;
 
 #define STG_INT_MIN        INT32_MIN
 #define STG_INT_MAX        INT32_MAX