Commit db3e8f2c0842aeaf1d00177c248ff908073fe73a
2012-05-13T10:14:10
Create path.h for the path.c functions No need to stash them in xkbcomp-priv.h; files which need the functions should explicitly include them. Signed-off-by: Ran Benita <ran234@gmail.com>
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144
diff --git a/Makefile.am b/Makefile.am
index 7175aa1..0da3b79 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -58,6 +58,7 @@ libxkbcommon_la_SOURCES = \
src/xkbcomp/parseutils.c \
src/xkbcomp/parseutils.h \
src/xkbcomp/path.c \
+ src/xkbcomp/path.h \
src/xkbcomp/scanner.l \
src/xkbcomp/symbols.c \
src/xkbcomp/vmod.c \
diff --git a/src/rules.c b/src/rules.c
index 73152f9..76f74b3 100644
--- a/src/rules.c
+++ b/src/rules.c
@@ -28,6 +28,7 @@
#include <ctype.h>
#include "rules.h"
+#include "path.h"
#ifdef DEBUG
#define PR_DEBUG(s) fprintf(stderr,s)
diff --git a/src/xkbcomp/misc.c b/src/xkbcomp/misc.c
index d386d3d..e29c9ae 100644
--- a/src/xkbcomp/misc.c
+++ b/src/xkbcomp/misc.c
@@ -25,6 +25,7 @@
********************************************************/
#include "xkbcomp-priv.h"
+#include "path.h"
#include "parseutils.h"
#include "keycodes.h"
diff --git a/src/xkbcomp/parseutils.c b/src/xkbcomp/parseutils.c
index a80315d..885ec30 100644
--- a/src/xkbcomp/parseutils.c
+++ b/src/xkbcomp/parseutils.c
@@ -25,6 +25,7 @@
********************************************************/
#include "parseutils.h"
+#include "path.h"
ParseCommon *
AppendStmt(ParseCommon * to, ParseCommon * append)
diff --git a/src/xkbcomp/path.c b/src/xkbcomp/path.c
index c213739..56463e6 100644
--- a/src/xkbcomp/path.c
+++ b/src/xkbcomp/path.c
@@ -27,7 +27,7 @@
#include <errno.h>
#include <limits.h>
-#include "xkbcomp-priv.h"
+#include "path.h"
/**
* Extract the first token from an include statement.
diff --git a/src/xkbcomp/path.h b/src/xkbcomp/path.h
new file mode 100644
index 0000000..3ffc882
--- /dev/null
+++ b/src/xkbcomp/path.h
@@ -0,0 +1,45 @@
+/************************************************************
+ Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc.
+
+ Permission to use, copy, modify, and distribute this
+ software and its documentation for any purpose and without
+ fee is hereby granted, provided that the above copyright
+ notice appear in all copies and that both that copyright
+ notice and this permission notice appear in supporting
+ documentation, and that the name of Silicon Graphics not be
+ used in advertising or publicity pertaining to distribution
+ of the software without specific prior written permission.
+ Silicon Graphics makes no representation about the suitability
+ of this software for any purpose. It is provided "as is"
+ without any express or implied warranty.
+
+ SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+ SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
+ GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
+ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
+ THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+ ********************************************************/
+
+#ifndef XKBCOMP_PATH_H
+#define XKBCOMP_PATH_H
+
+#include <stdio.h>
+
+#include "xkbcomp-priv.h"
+
+bool
+XkbParseIncludeMap(char **str_inout, char **file_rtrn, char **map_rtrn,
+ char *nextop_rtrn, char **extra_data);
+
+const char *
+XkbDirectoryForInclude(unsigned type);
+
+FILE *
+XkbFindFileInPath(struct xkb_context *ctx,
+ const char *name, unsigned type, char **pathRtrn);
+
+#endif /* XKBCOMP_PATH_H */
diff --git a/src/xkbcomp/xkbcomp-priv.h b/src/xkbcomp/xkbcomp-priv.h
index 81fd01e..09bdd2a 100644
--- a/src/xkbcomp/xkbcomp-priv.h
+++ b/src/xkbcomp/xkbcomp-priv.h
@@ -80,15 +80,4 @@ FindKeyNameForAlias(struct xkb_keymap *keymap, unsigned long lname,
extern bool
UpdateModifiersFromCompat(struct xkb_keymap *keymap);
-extern const char *
-XkbDirectoryForInclude(unsigned type);
-
-extern FILE *
-XkbFindFileInPath(struct xkb_context *ctx, const char *name,
- unsigned type, char **pathRtrn);
-
-extern bool
-XkbParseIncludeMap(char **str_inout, char **file_rtrn, char **map_rtrn,
- char *nextop_rtrn, char **extra_data);
-
#endif /* XKBCOMP_PRIV_H */
diff --git a/src/xkbcomp/xkbcomp.c b/src/xkbcomp/xkbcomp.c
index e6f71c9..68e180f 100644
--- a/src/xkbcomp/xkbcomp.c
+++ b/src/xkbcomp/xkbcomp.c
@@ -27,6 +27,7 @@ authorization from the authors.
#include "xkbcomp-priv.h"
#include "rules.h"
#include "parseutils.h"
+#include "path.h"
/* Global warning level */
unsigned int warningLevel = 0;