aboutsummaryrefslogtreecommitdiff
path: root/libXfont/src/util/format.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2014-09-21 18:14:18 +0200
committermarha <marha@users.sourceforge.net>2014-09-21 18:14:18 +0200
commit4e080e0165d18887e2a0fccd7f30cf20fd04b178 (patch)
treedbefa5addb60abe7a5c52dbc1daea7d6e0c9d4d0 /libXfont/src/util/format.c
parente16399e57caac9e859a7d28921c73ef9839b571e (diff)
parentd0f70707dde032e662dbd5bc70df6ac915403abe (diff)
downloadvcxsrv-4e080e0165d18887e2a0fccd7f30cf20fd04b178.tar.gz
vcxsrv-4e080e0165d18887e2a0fccd7f30cf20fd04b178.tar.bz2
vcxsrv-4e080e0165d18887e2a0fccd7f30cf20fd04b178.zip
Merge remote-tracking branch 'origin/released'
Conflicts: libXfont/src/fontfile/fontfile.c libXfont/src/util/utilbitmap.c
Diffstat (limited to 'libXfont/src/util/format.c')
-rw-r--r--libXfont/src/util/format.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/libXfont/src/util/format.c b/libXfont/src/util/format.c
index f5424fe41..c1f9762fa 100644
--- a/libXfont/src/util/format.c
+++ b/libXfont/src/util/format.c
@@ -6,11 +6,11 @@
* documentation for any purpose is hereby granted without fee, 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 names of Network Computing Devices or Digital
- * not be used in advertising or publicity pertaining to distribution of the
- * software without specific, written prior permission. Network Computing
- * Devices and Digital make no representations about the suitability of
- * this software for any purpose. It is provided "as is" without express
+ * documentation, and that the names of Network Computing Devices or Digital
+ * not be used in advertising or publicity pertaining to distribution of the
+ * software without specific, written prior permission. Network Computing
+ * Devices and Digital make no representations about the suitability of
+ * this software for any purpose. It is provided "as is" without express
* or implied warranty.
*
* NETWORK COMPUTING DEVICES AND DIGITAL DISCLAIM ALL WARRANTIES WITH
@@ -59,12 +59,12 @@ from The Open Group.
#include <X11/fonts/fontutil.h>
int
-CheckFSFormat(fsBitmapFormat format,
- fsBitmapFormatMask fmask,
- int *bit_order,
- int *byte_order,
- int *scan,
- int *glyph,
+CheckFSFormat(fsBitmapFormat format,
+ fsBitmapFormatMask fmask,
+ int *bit_order,
+ int *byte_order,
+ int *scan,
+ int *glyph,
int *image)
{
/* convert format to what the low levels want */