diff options
Diffstat (limited to 'src/XpmI.h')
| -rw-r--r-- | src/XpmI.h | 22 |
1 files changed, 0 insertions, 22 deletions
@@ -34,11 +34,6 @@ * Developed by Arnaud Le Hors * \*****************************************************************************/ -/* - * The code related to FOR_MSW has been added by - * HeDu (hedu@cul-ipn.uni-kiel.de) 4/94 - */ - #ifndef XPMI_h #define XPMI_h @@ -53,13 +48,9 @@ #include <stdlib.h> #include <limits.h> -#ifdef FOR_MSW -#include "simx.h" -#else #include <X11/Xos.h> #include <X11/Xfuncs.h> #include <X11/Xmd.h> -#endif #ifdef VMS #include <unixio.h> @@ -75,17 +66,9 @@ */ #define XpmFree(ptr) free(ptr) -#ifndef FOR_MSW #define XpmMalloc(size) malloc((size)) #define XpmRealloc(ptr, size) realloc((ptr), (size)) #define XpmCalloc(nelem, elsize) calloc((nelem), (elsize)) -#else -/* checks for mallocs bigger than 64K */ -#define XpmMalloc(size) boundCheckingMalloc((long)(size))/* in simx.[ch] */ -#define XpmRealloc(ptr, size) boundCheckingRealloc((ptr),(long)(size)) -#define XpmCalloc(nelem, elsize) \ - boundCheckingCalloc((long)(nelem),(long) (elsize)) -#endif #include <stdint.h> /* For SIZE_MAX */ #include <limits.h> @@ -188,7 +171,6 @@ HFUNC(xpmSetInfo, void, (XpmInfo *info, XpmAttributes *attributes)); HFUNC(xpmSetAttributes, void, (XpmAttributes *attributes, XpmImage *image, XpmInfo *info)); -#ifndef FOR_MSW HFUNC(xpmCreatePixmapFromImage, int, (Display *display, Drawable d, XImage *ximage, Pixmap *pixmap_return)); @@ -196,7 +178,6 @@ HFUNC(xpmCreateImageFromPixmap, void, (Display *display, Pixmap pixmap, XImage **ximage_return, unsigned int *width, unsigned int *height)); -#endif /* structures and functions related to hastable code */ @@ -259,9 +240,6 @@ HFUNC(xpmReadRgbNames, int, (const char *rgb_fname, xpmRgbName *rgbn)); HFUNC(xpmGetRgbName, char *, (xpmRgbName *rgbn, int rgbn_max, int red, int green, int blue)); HFUNC(xpmFreeRgbNames, void, (xpmRgbName *rgbn, int rgbn_max)); -#ifdef FOR_MSW -HFUNC(xpmGetRGBfromName,int, (char *name, int *r, int *g, int *b)); -#endif HFUNC(xpm_xynormalizeimagebits, void, (register unsigned char *bp, register XImage *img)); |