Update of /cvsroot/gtk2hs/gtk2hs/tools/c2hs/c
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21618/tools/c2hs/c
Modified Files:
CParser.hs
Log Message:
Various win32 fixes.
configure.ac: Do not define WIN32 on windows since it is already defined on
that platform.
Define a conditional so that Makefile.am can conditonally compile a few modules.
We no longer need to pass -fnative-struct to gcc on windows.
Makefile.am: Add $(EXEEXT) in a few places to so names of dependencies are
correct on windows.
Only compile the plug and socket modules on non-win32 platforms.
C2HSConfig.hs.in: comment out the @TMPDIR@ substitution since it causes
problems in windows and is not used anyway.
CParser.hs: make c2hs accept __attribute__'s on declerations of functions
returning pointer types. This is needed for some mingw header file (float.h).
Index: CParser.hs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/tools/c2hs/c/CParser.hs,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CParser.hs 14 Jan 2005 00:18:32 -0000 1.2
+++ CParser.hs 7 Feb 2005 00:04:28 -0000 1.3
@@ -678,7 +678,7 @@
--
parseCDeclr :: CParser CDeclr
parseCDeclr =
- (pointer `opt` id)
+ ((pointer *-> optMaybe parseGnuCAttr) `opt` id)
*> base
*> many (flip (.)) id (arrayType <|> newStyleFun <|> oldStyleFun)
*-> list parseGnuCAttr -- ignore GCC's __attribute__
|
