From: Duncan C. <dun...@us...> - 2005-04-07 00:38:54
|
Update of /cvsroot/gtk2hs/gtk2hs/gtk/Graphics/UI/Gtk/Pango In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17594/gtk/Graphics/UI/Gtk/Pango Modified Files: Types.chs.pp Log Message: Remove support for ghc pre 5.04. Index: Types.chs.pp =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/Graphics/UI/Gtk/Pango/Types.chs.pp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- Types.chs.pp 12 Feb 2005 17:19:25 -0000 1.2 +++ Types.chs.pp 7 Apr 2005 00:38:42 -0000 1.3 @@ -60,14 +60,9 @@ layout_iter_free :: Ptr LayoutIter -> FinalizerPtr LayoutIter layout_iter_free _ = layout_iter_free' -#elif __GLASGOW_HASKELL__>=504 - -foreign import ccall unsafe "pango_layout_iter_free" - layout_iter_free :: Ptr LayoutIter -> IO () - #else -foreign import ccall "pango_layout_iter_free" unsafe +foreign import ccall unsafe "pango_layout_iter_free" layout_iter_free :: Ptr LayoutIter -> IO () #endif @@ -89,31 +84,16 @@ pango_layout_line_unref :: Ptr LayoutLine -> FinalizerPtr LayoutLine pango_layout_line_unref _ = pango_layout_line_unref' -#elif __GLASGOW_HASKELL__>=504 - -foreign import ccall unsafe "pango_layout_line_unref" - pango_layout_line_unref :: Ptr LayoutLine -> IO () - #else -foreign import ccall "pango_layout_line_unref" unsafe +foreign import ccall unsafe "pango_layout_line_unref" pango_layout_line_unref :: Ptr LayoutLine -> IO () #endif -#if __GLASGOW_HASKELL__>=504 - foreign import ccall unsafe "pango_layout_line_ref" pango_layout_line_ref :: Ptr LayoutLine -> IO () -#else - -foreign import ccall "pango_layout_line_ref" unsafe - pango_layout_line_ref :: Ptr LayoutLine -> IO () - -#endif - - -- | A possibly partial description of font(s). -- {#pointer *PangoFontDescription as FontDescription foreign newtype #} @@ -132,14 +112,9 @@ FinalizerPtr FontDescription pango_font_description_free _ = pango_font_description_free' -#elif __GLASGOW_HASKELL__>=504 - -foreign import ccall unsafe "pango_font_description_free" - pango_font_description_free :: Ptr FontDescription -> IO () - #else -foreign import ccall "pango_font_description_free" unsafe +foreign import ccall unsafe "pango_font_description_free" pango_font_description_free :: Ptr FontDescription -> IO () #endif |