6 files changed, 32 insertions, 2 deletions
diff --git a/libxkbfile/include/X11/extensions/XKBrules.h b/libxkbfile/include/X11/extensions/XKBrules.h
index 59d11cd88..f898da8d9 100644
--- a/libxkbfile/include/X11/extensions/XKBrules.h
+++ b/libxkbfile/include/X11/extensions/XKBrules.h
@@ -179,7 +179,7 @@ extern void XkbRF_Free(
 #define	_XKB_RF_NAMES_PROP_MAXLEN	1024
 
 #ifndef XKB_IN_SERVER
-
+#ifndef _MSC_VER
 extern Bool XkbRF_GetNamesProp(
    Display *		/* dpy */,
    char **		/* rules_file_rtrn */,
@@ -193,6 +193,7 @@ extern Bool XkbRF_SetNamesProp(
 );
 
 #endif
+#endif
 
 _XFUNCPROTOEND
 
diff --git a/libxkbfile/src/XKBfileInt.h b/libxkbfile/src/XKBfileInt.h
index e810e6131..ef188095d 100644
--- a/libxkbfile/src/XKBfileInt.h
+++ b/libxkbfile/src/XKBfileInt.h
@@ -61,6 +61,11 @@
 
 #endif
 
+#include <unistd.h>
+#ifdef _MSC_VER
+#define inline __inline
+#endif
+
 _XFUNCPROTOBEGIN
 
 static inline
diff --git a/libxkbfile/src/config.h b/libxkbfile/src/config.h
new file mode 100644
index 000000000..6cd15164b
--- /dev/null
+++ b/libxkbfile/src/config.h
@@ -0,0 +1,4 @@
+#ifndef __CONFIG_H__
+#define __CONFIG_H__
+
+#endif
diff --git a/libxkbfile/src/makefile b/libxkbfile/src/makefile
new file mode 100644
index 000000000..5c76670f4
--- /dev/null
+++ b/libxkbfile/src/makefile
@@ -0,0 +1,18 @@
+LIBRARY = libxkbfile
+
+CSRCS =  cout.c \
+         maprules.c \
+         srvmisc.c \
+         xkbatom.c \
+         xkbbells.c \
+         xkbconfig.c \
+         xkbdraw.c \
+         xkberrs.c \
+         xkbmisc.c \
+         xkbout.c \
+         xkbtext.c \
+         xkmout.c \
+         xkmread.c
+
+INCLUDES := . $(MHMAKECONF)\X11\extensions $(MHMAKECONF) $(MHMAKECONF)\include
+
diff --git a/libxkbfile/src/xkmout.c b/libxkbfile/src/xkmout.c
index 79d86efe1..91e66f400 100644
--- a/libxkbfile/src/xkmout.c
+++ b/libxkbfile/src/xkmout.c
@@ -1316,7 +1316,7 @@ int			(*getTOC)(
 	XkbFileInfo *	/* result */,
 	XkmInfo *	/* info */,
 	int		/* max_to */,
-	xkmSectionInfo */* toc_rtrn */
+	xkmSectionInfo * /* toc_rtrn */
 );
 
     switch (result->type) {
diff --git a/libxkbfile/src/xkmread.c b/libxkbfile/src/xkmread.c
index ae056617b..e5127c910 100644
--- a/libxkbfile/src/xkmread.c
+++ b/libxkbfile/src/xkmread.c
@@ -1213,6 +1213,8 @@ char 		name[100];
 		return _XkbDupString(name);
 	    break;
 	default:
+	    fseek(file,toc->offset,SEEK_SET);
+	    fread(&tmpTOC,SIZEOF(xkmSectionInfo),1,file);
 	    _XkbLibError(_XkbErrBadImplementation,
 				XkbConfigText(tmpTOC.type,XkbMessage),0);
 	    break;