From: Daniel W. <dm...@lu...> - 2012-06-03 00:11:07
|
diffing dir... Mon May 28 19:27:42 BST 2012 Daniel Wagner <da...@wa...> * use forward-compatible Foreign.C.Types imports Ignore-this: 6c4a618a653ddbaef4bd6974e7177d45 Previously, the hierarchy generator used #if in an attempt to choose between two choices for an import line. The one choice gives warnings on old GHC's; the other gives warnings on new GHC's. However, the symbol used in the #if isn't defined by gtk2hs' custom build system, so one of the two choices was the defacto code. Until this patch, the defacto code was the one that produced warnings on new GHC's. It should be possible to revise the build system to define this symbol, but it is becoming less and less likely I will have the energy to work out how to do this correctly. Instead this patch makes the choice to prefer the import that compiles cleanly on new GHC's, and let old GHC's print warnings. hunk ./tools/hierarchyGen/Hierarchy.chs.template 41 -#if __GLASGOW_HASKELL__>=704 hunk ./tools/hierarchyGen/Hierarchy.chs.template 42 -#else -import Foreign.C.Types (CULong, CUInt) -#endif -import System.Glib.GType (GType, typeInstanceIsA) +import System.Glib.GType (GType, typeInstanceIsA) |