diff options
| author | marha <marha@users.sourceforge.net> | 2009-09-02 21:09:13 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-09-02 21:09:13 +0000 |
| commit | 8fedf58693f42869528b41408ac4d6012839e973 (patch) | |
| tree | 62a817bea7dfc71050292d302ba94f5e349c67a7 /xorg-server/fonts.src/font-util/ucs2any.c | |
| parent | ac14083f465166b298162a57fff0bad90e528fff (diff) | |
| parent | 6f25a23db1df27e992c34f6fd4c82e83c44fc2e2 (diff) | |
| download | vcxsrv-8fedf58693f42869528b41408ac4d6012839e973.tar.gz vcxsrv-8fedf58693f42869528b41408ac4d6012839e973.tar.bz2 vcxsrv-8fedf58693f42869528b41408ac4d6012839e973.zip | |
svn merge https://vcxsrv.svn.sourceforge.net/svnroot/vcxsrv/branches/released .
Diffstat (limited to 'xorg-server/fonts.src/font-util/ucs2any.c')
| -rw-r--r-- | xorg-server/fonts.src/font-util/ucs2any.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/xorg-server/fonts.src/font-util/ucs2any.c b/xorg-server/fonts.src/font-util/ucs2any.c index 0437c5b49..054a40ac2 100644 --- a/xorg-server/fonts.src/font-util/ucs2any.c +++ b/xorg-server/fonts.src/font-util/ucs2any.c @@ -13,9 +13,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. Neither the name of The NetBSD Foundation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED @@ -55,7 +52,7 @@ #include <unistd.h> /* global variable for argv[0] */ -const char *my_name = NULL; +static const char *my_name = NULL; #ifdef NEED_BASENAME static char * @@ -336,7 +333,7 @@ DEC VT100 graphics characters in the range 1-31 (as expected by some old xterm versions and a few other applications) */ #define decmap_size 31 -int decmap[decmap_size] = { +static int decmap[decmap_size] = { 0x25C6, /* BLACK DIAMOND */ 0x2592, /* MEDIUM SHADE */ 0x2409, /* SYMBOL FOR HORIZONTAL TABULATION */ @@ -522,6 +519,7 @@ main(int argc, char *argv[]) char *registry_encoding = NULL; my_name = argv[0]; + bbx.cheight = bbx.cxoff = bbx.cyoff = -1; startchar = da_new("startchar"); my_char = da_new("my_char"); |