[PATCH:libxkbcommon] Make XkbFileCreate argument types match between header & implementation

Alan Coopersmith alan.coopersmith at oracle.com
Fri Nov 8 17:08:35 PST 2013


Fixes build failure with Solaris Studio compilers:
"src/xkbcomp/ast-build.c", line 492: identifier redeclared: XkbFileCreate
  current : function(..., enum xkb_map_flags)
  previous: function(..., unsigned int) : "src/xkbcomp/ast-build.h", line 98

Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
---
 src/xkbcomp/ast-build.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/xkbcomp/ast-build.h b/src/xkbcomp/ast-build.h
index 0ecd124..4340c8c 100644
--- a/src/xkbcomp/ast-build.h
+++ b/src/xkbcomp/ast-build.h
@@ -96,7 +96,7 @@ IncludeCreate(struct xkb_context *ctx, char *str, enum merge_mode merge);
 
 XkbFile *
 XkbFileCreate(struct xkb_context *ctx, enum xkb_file_type type, char *name,
-              ParseCommon *defs, unsigned flags);
+              ParseCommon *defs, enum xkb_map_flags flags);
 
 void
 FreeStmt(ParseCommon *stmt);
-- 
1.7.9.2



More information about the xorg-devel mailing list