diff options
| author | marha <marha@users.sourceforge.net> | 2009-07-25 12:47:39 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-07-25 12:47:39 +0000 |
| commit | cb897b8ffca0a68c017c2edfa523cb5ff0491962 (patch) | |
| tree | 8b4e9e320258d5280ce454163c49363030626c1a /libX11/src/FSWrap.c | |
| parent | 213d71f78d6f9e35b23c00e35f9919efc9670b1e (diff) | |
| parent | c87efef42f76c2ff0dcfad2842ab369beffd21de (diff) | |
| download | vcxsrv-cb897b8ffca0a68c017c2edfa523cb5ff0491962.tar.gz vcxsrv-cb897b8ffca0a68c017c2edfa523cb5ff0491962.tar.bz2 vcxsrv-cb897b8ffca0a68c017c2edfa523cb5ff0491962.zip | |
svn merge file:///D:/svnrepos/vcxsrv/branches/released .
Diffstat (limited to 'libX11/src/FSWrap.c')
| -rw-r--r-- | libX11/src/FSWrap.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libX11/src/FSWrap.c b/libX11/src/FSWrap.c index b4e17e445..0ea34894f 100644 --- a/libX11/src/FSWrap.c +++ b/libX11/src/FSWrap.c @@ -18,15 +18,15 @@ * OPEN SOFTWARE FOUNDATION DISCLAIMS ALL WARRANTIES WITH REGARD TO * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND * FITNESS, IN NO EVENT SHALL OPEN SOFTWARE FOUNDATIONN BE - * LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * 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. - * - * M. Collins OSF + * + * M. Collins OSF * * Katsuhisa Yano TOSHIBA Corp. - */ + */ /* @@ -181,13 +181,13 @@ XCreateFontSet ( om = XOpenOM(dpy, NULL, NULL, NULL); if (om == NULL) return (XFontSet) NULL; - + if ((oc = XCreateOC(om, XNBaseFontName, base_font_name_list, NULL))) { list = &oc->core.missing_list; oc->core.om_automatic = True; } else list = &om->core.required_charset; - + *missing_charset_list = copy_string_list(list->charset_list, list->charset_count); *missing_charset_count = list->charset_count; @@ -200,7 +200,7 @@ XCreateFontSet ( if (!*def_string) *def_string = ""; } - + if (oc == NULL) XCloseOM(om); |