diff options
author | marha <marha@users.sourceforge.net> | 2012-03-05 09:59:38 +0100 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2012-03-05 09:59:38 +0100 |
commit | ffe218bbb0ffa6d2a7f7cbf6b1f81797e667183a (patch) | |
tree | 233b818e67de2073647e46e91ac688c6b43d5917 /libXfont/src/builtins | |
parent | 15a500d3edb03668b43cc6898fafcda024d0f006 (diff) | |
download | vcxsrv-ffe218bbb0ffa6d2a7f7cbf6b1f81797e667183a.tar.gz vcxsrv-ffe218bbb0ffa6d2a7f7cbf6b1f81797e667183a.tar.bz2 vcxsrv-ffe218bbb0ffa6d2a7f7cbf6b1f81797e667183a.zip |
libfontenc xserver pixman mesa git update 5 Mar 2012
font-util-1.3.0
xclock-1.0.6
libXfont-1.4.5
inputproto-2.2
Diffstat (limited to 'libXfont/src/builtins')
-rw-r--r-- | libXfont/src/builtins/Makefile.in | 1 | ||||
-rw-r--r-- | libXfont/src/builtins/builtin.h | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/libXfont/src/builtins/Makefile.in b/libXfont/src/builtins/Makefile.in index 9cbdadd59..53c718f6b 100644 --- a/libXfont/src/builtins/Makefile.in +++ b/libXfont/src/builtins/Makefile.in @@ -95,6 +95,7 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ +BASE_CFLAGS = @BASE_CFLAGS@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ diff --git a/libXfont/src/builtins/builtin.h b/libXfont/src/builtins/builtin.h index 418bfe984..75dff8d85 100644 --- a/libXfont/src/builtins/builtin.h +++ b/libXfont/src/builtins/builtin.h @@ -16,7 +16,7 @@ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE * 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 + * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * * Author: Keith Packard, SuSE, Inc. @@ -36,7 +36,7 @@ typedef struct _BuiltinFile { } BuiltinFileRec, *BuiltinFilePtr; typedef struct _BuiltinDir { - char *file_name; + const char *file_name; char *font_name; } BuiltinDirRec, *BuiltinDirPtr; |