diff options
Diffstat (limited to 'libxkbfile')
| -rw-r--r-- | libxkbfile/src/XKBfileInt.h | 5 | ||||
| -rw-r--r-- | libxkbfile/src/config.h | 4 | ||||
| -rw-r--r-- | libxkbfile/src/makefile | 18 | ||||
| -rw-r--r-- | libxkbfile/src/maprules.c | 1 | ||||
| -rw-r--r-- | libxkbfile/src/xkbconfig.c | 1 | ||||
| -rw-r--r-- | libxkbfile/src/xkbmisc.c | 1 | ||||
| -rw-r--r-- | libxkbfile/src/xkbout.c | 1 | ||||
| -rw-r--r-- | libxkbfile/src/xkbtext.c | 1 | ||||
| -rw-r--r-- | libxkbfile/src/xkmout.c | 2 | ||||
| -rw-r--r-- | libxkbfile/src/xkmread.c | 3 |
10 files changed, 30 insertions, 7 deletions
diff --git a/libxkbfile/src/XKBfileInt.h b/libxkbfile/src/XKBfileInt.h index a99b7c821..22083fa46 100644 --- a/libxkbfile/src/XKBfileInt.h +++ b/libxkbfile/src/XKBfileInt.h @@ -63,6 +63,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/maprules.c b/libxkbfile/src/maprules.c index 104dad38e..d7d7e8d7d 100644 --- a/libxkbfile/src/maprules.c +++ b/libxkbfile/src/maprules.c @@ -56,7 +56,6 @@ #else -#define NEED_EVENTS #include <X11/Xproto.h> #include <X11/X.h> #include <X11/Xos.h> diff --git a/libxkbfile/src/xkbconfig.c b/libxkbfile/src/xkbconfig.c index 37272ceee..e1c0fd006 100644 --- a/libxkbfile/src/xkbconfig.c +++ b/libxkbfile/src/xkbconfig.c @@ -51,7 +51,6 @@ #else #include <X11/X.h> -#define NEED_EVENTS #include <X11/keysym.h> #include <X11/Xproto.h> #include "misc.h" diff --git a/libxkbfile/src/xkbmisc.c b/libxkbfile/src/xkbmisc.c index 41f1f7f25..fd9d6ceae 100644 --- a/libxkbfile/src/xkbmisc.c +++ b/libxkbfile/src/xkbmisc.c @@ -51,7 +51,6 @@ #else #include <X11/X.h> -#define NEED_EVENTS #include <X11/keysym.h> #include <X11/Xproto.h> #include "misc.h" diff --git a/libxkbfile/src/xkbout.c b/libxkbfile/src/xkbout.c index 53457f1c1..8fedccba0 100644 --- a/libxkbfile/src/xkbout.c +++ b/libxkbfile/src/xkbout.c @@ -49,7 +49,6 @@ #else #include <X11/X.h> -#define NEED_EVENTS #include <X11/keysym.h> #include <X11/Xproto.h> #include "misc.h" diff --git a/libxkbfile/src/xkbtext.c b/libxkbfile/src/xkbtext.c index 577bdb5b6..bf0150e51 100644 --- a/libxkbfile/src/xkbtext.c +++ b/libxkbfile/src/xkbtext.c @@ -50,7 +50,6 @@ #else #include <X11/X.h> -#define NEED_EVENTS #include <X11/Xproto.h> #include "misc.h" #include "inputstr.h" diff --git a/libxkbfile/src/xkmout.c b/libxkbfile/src/xkmout.c index 403e48810..08efea68d 100644 --- a/libxkbfile/src/xkmout.c +++ b/libxkbfile/src/xkmout.c @@ -1318,7 +1318,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 bf46becc1..a8fd04361 100644 --- a/libxkbfile/src/xkmread.c +++ b/libxkbfile/src/xkmread.c @@ -52,7 +52,6 @@ #else #include <X11/X.h> -#define NEED_EVENTS #include <X11/Xproto.h> #include <X11/keysym.h> #include "misc.h" @@ -1216,6 +1215,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; |