diff options
Diffstat (limited to 'libXfont/src/bitmap')
| -rw-r--r-- | libXfont/src/bitmap/bitmapfunc.c | 4 | ||||
| -rw-r--r-- | libXfont/src/bitmap/bitmaputil.c | 4 | ||||
| -rw-r--r-- | libXfont/src/bitmap/bitscale.c | 4 | ||||
| -rw-r--r-- | libXfont/src/bitmap/makefile | 16 |
4 files changed, 23 insertions, 5 deletions
diff --git a/libXfont/src/bitmap/bitmapfunc.c b/libXfont/src/bitmap/bitmapfunc.c index 8c6b3d896..049c39967 100644 --- a/libXfont/src/bitmap/bitmapfunc.c +++ b/libXfont/src/bitmap/bitmapfunc.c @@ -92,6 +92,7 @@ static BitmapFileFunctionsRec readers[] = { { bdfReadFont, bdfReadFontInfo} , # endif #endif + { NULL, NULL } }; @@ -220,9 +221,10 @@ static FontRendererRec renderers[] = { CAPABILITIES }, # endif #endif + { NULL, 0, NULL, 0, NULL, NULL, 0, 0 } }; -#define numRenderers (sizeof renderers / sizeof renderers[0]) +#define numRenderers (sizeof renderers / sizeof renderers[0] - 1) void BitmapRegisterFontFileFunctions (void) diff --git a/libXfont/src/bitmap/bitmaputil.c b/libXfont/src/bitmap/bitmaputil.c index 0a1c87e73..7ac94b3fb 100644 --- a/libXfont/src/bitmap/bitmaputil.c +++ b/libXfont/src/bitmap/bitmaputil.c @@ -34,13 +34,9 @@ from The Open Group. #include <X11/fonts/bitmap.h> #include <X11/fonts/bdfint.h> -#ifndef MAXSHORT #define MAXSHORT 32767 -#endif -#ifndef MINSHORT #define MINSHORT -32768 -#endif static xCharInfo initMinMetrics = { MAXSHORT, MAXSHORT, MAXSHORT, MAXSHORT, MAXSHORT, 0xFFFF}; diff --git a/libXfont/src/bitmap/bitscale.c b/libXfont/src/bitmap/bitscale.c index c9af4c031..caeb96384 100644 --- a/libXfont/src/bitmap/bitscale.c +++ b/libXfont/src/bitmap/bitscale.c @@ -43,6 +43,10 @@ from The Open Group. #define MAX(a,b) (((a)>(b)) ? a : b) #endif +#ifdef _MSC_VER +#define hypot _hypot +#endif + /* Should get this from elsewhere */ extern unsigned long __GetServerGeneration(void); diff --git a/libXfont/src/bitmap/makefile b/libXfont/src/bitmap/makefile new file mode 100644 index 000000000..f7ea10fdc --- /dev/null +++ b/libXfont/src/bitmap/makefile @@ -0,0 +1,16 @@ +LIBRARY = libbitmap + +CSRCS = \ + bdfread.c \ + bdfutils.c \ + bitmap.c \ + bitmapfunc.c \ + bitmaputil.c \ + bitscale.c \ + fontink.c \ + pcfread.c \ + pcfwrite.c \ + snfread.c + +INCLUDES := ../.. $(INCLUDES) + |