Fix some more warnings

[ghc-base.git] / include / Typeable.h

diff --git a/include/Typeable.h b/include/Typeable.h
index ea3fda7..649d6f3 100644 (file)
--- a/include/Typeable.h
+++ b/include/Typeable.h
@@ -1,33 +1,41 @@
-/* ----------------------------------------------------------------------------
- * Macros to help make Typeable instances.
- *
- * INSTANCE_TYPEABLEn(tc,tcname,"tc") defines
- *
- *     instance Typeable/n/ tc
- *     instance Typeable a => Typeable/n-1/ (tc a)
- *     instance (Typeable a, Typeable b) => Typeable/n-2/ (tc a b)
- *     ...
- *     instance (Typeable a1, ..., Typeable an) => Typeable (tc a1 ... an)
- * -------------------------------------------------------------------------- */
+{- --------------------------------------------------------------------------
+// Macros to help make Typeable instances.
+//
+// INSTANCE_TYPEABLEn(tc,tcname,"tc") defines
+//
+//     instance Typeable/n/ tc
+//     instance Typeable a => Typeable/n-1/ (tc a)
+//     instance (Typeable a, Typeable b) => Typeable/n-2/ (tc a b)
+//     ...
+//     instance (Typeable a1, ..., Typeable an) => Typeable (tc a1 ... an)
+// --------------------------------------------------------------------------
+-}
+
+#ifndef TYPEABLE_H
+#define TYPEABLE_H
 
 #define INSTANCE_TYPEABLE0(tycon,tcname,str) \
+tcname :: TyCon; \
 tcname = mkTyCon str; \
 instance Typeable tycon where { typeOf _ = mkTyConApp tcname [] }
 
 #ifdef __GLASGOW_HASKELL__
 
-/* For GHC, the extra instances follow from general instance declarations
- * defined in Data.Typeable. */
+--  // For GHC, the extra instances follow from general instance declarations
+--  // defined in Data.Typeable.
 
 #define INSTANCE_TYPEABLE1(tycon,tcname,str) \
+tcname :: TyCon; \
 tcname = mkTyCon str; \
 instance Typeable1 tycon where { typeOf1 _ = mkTyConApp tcname [] }
 
 #define INSTANCE_TYPEABLE2(tycon,tcname,str) \
+tcname :: TyCon; \
 tcname = mkTyCon str; \
 instance Typeable2 tycon where { typeOf2 _ = mkTyConApp tcname [] }
 
 #define INSTANCE_TYPEABLE3(tycon,tcname,str) \
+tcname :: TyCon; \
 tcname = mkTyCon str; \
 instance Typeable3 tycon where { typeOf3 _ = mkTyConApp tcname [] }
 
@@ -57,3 +65,5 @@ instance (Typeable a, Typeable b, Typeable c) => Typeable (tycon a b c) where {
   typeOf = typeOfDefault }
 
 #endif /* !__GLASGOW_HASKELL__ */
+
+#endif