ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

We no longer need the xpm wrappers.

This commit is contained in:
Alexandre Julliard 2002-01-04 18:47:01 +00:00
parent 3775a65778
commit 8850a5fc32
5 changed files with 3 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
include/ts_xpm.h
View File

@ -1,27 +0,0 @@
/*
* Thread safe wrappers around xpm calls.
* Always include this file instead of <X11/xpm.h>.
* This file was generated automatically by tools/make_X11wrappers
* DO NOT EDIT!
*/
#ifndef __WINE_TS_XPM_H
#define __WINE_TS_XPM_H
#ifndef __WINE_CONFIG_H
# error You must include config.h to use this header
#endif
#ifdef HAVE_LIBXXPM
#include <X11/xpm.h>
extern void (*wine_tsx11_lock)(void);
extern void (*wine_tsx11_unlock)(void);
extern int TSXpmCreatePixmapFromData(Display *, Drawable, char **, Pixmap *, Pixmap *, XpmAttributes *);
extern int TSXpmAttributesSize(void);
#endif /* defined(HAVE_LIBXXPM) */
#endif /* __WINE_TS_XPM_H */

14
tools/make_X11wrappers
View File

@ -17,7 +17,7 @@
$X11_include_dir = "/usr/X11/include"; $X11_include_dir = "/usr/X11/include";
$outdir = "tsx11"; $outdir = "tsx11";
$wantfile = "$outdir/X11_calls"; $wantfile = "$outdir/X11_calls";
@dolist = ("Xlib", "Xresource", "Xutil", "xpm", "XShm", "xf86dga", "xf86dga2", "xf86vmode", "shape", "xvideo", "Xrender"); @dolist = ("Xlib", "Xresource", "Xutil", "XShm", "xf86dga", "xf86dga2", "xf86vmode", "shape", "xvideo", "Xrender");
# First read list of wanted function names. # First read list of wanted function names.
@ -70,10 +70,6 @@ foreach $name (@dolist) {
$pre_file = "#ifdef HAVE_LIBXXSHM\n"; $pre_file = "#ifdef HAVE_LIBXXSHM\n";
$post_file = "#endif /* defined(HAVE_LIBXXSHM) */\n"; $post_file = "#endif /* defined(HAVE_LIBXXSHM) */\n";
} }
if($name eq "xpm") {
$pre_file = "#ifdef HAVE_LIBXXPM\n";
$post_file = "#endif /* defined(HAVE_LIBXXPM) */\n";
}
if($name eq "xf86vmode") { if($name eq "xf86vmode") {
$x11_incl = "#include <X11/Xlib.h>\n"; $x11_incl = "#include <X11/Xlib.h>\n";
$extensions_dir = "extensions/"; $extensions_dir = "extensions/";
@ -140,13 +136,7 @@ $x11_incl#include <X11/$extensions_dir$inc_name.h>
END END
if($name eq "xpm") { # Handle as special case. if ($name eq "XShm") {
output_fn("XpmCreatePixmapFromData", "int",
"Display *, Drawable, char **, Pixmap *, Pixmap *, XpmAttributes *",
"Display *a0, Drawable a1, char **a2, Pixmap *a3, Pixmap *a4, XpmAttributes *a5",
"a0, a1, a2, a3, a4, a5");
output_fn("XpmAttributesSize", "int", "void", "void", "");
} elsif($name eq "XShm") {
output_fn("XShmQueryExtension", "Bool", output_fn("XShmQueryExtension", "Bool",
"Display *", "Display *a0", "a0"); "Display *", "Display *a0", "a0");
output_fn("XShmQueryVersion", "Bool", output_fn("XShmQueryVersion", "Bool",

3
tsx11/Makefile.in
View File

@ -20,8 +20,7 @@ C_SRCS = \
ts_xresource.c \ ts_xresource.c \
ts_xvideo.c \ ts_xvideo.c \
ts_xutil.c \ ts_xutil.c \
ts_shape.c \ ts_shape.c
ts_xpm.c
all: libwine_tsx11.$(LIBEXT) all: libwine_tsx11.$(LIBEXT)

2
tsx11/X11_calls
View File

@ -177,8 +177,6 @@ XUniqueContext
XUnmapWindow XUnmapWindow
XWarpPointer XWarpPointer
XXorRegion XXorRegion
XpmAttributesSize
XpmCreatePixmapFromData
XrmGetFileDatabase XrmGetFileDatabase
XrmGetResource XrmGetResource
XrmGetStringDatabase XrmGetStringDatabase

35
tsx11/ts_xpm.c
View File

@ -1,35 +0,0 @@
/*
* Thread safe wrappers around xpm calls.
* This file was generated automatically by tools/make_X11wrappers
* DO NOT EDIT!
*/
#include "config.h"
#ifdef HAVE_LIBXXPM
#include <X11/xpm.h>
#include "ts_xpm.h"
int TSXpmCreatePixmapFromData(Display *a0, Drawable a1, char **a2, Pixmap *a3, Pixmap *a4, XpmAttributes *a5)
{
int r;
wine_tsx11_lock();
r = XpmCreatePixmapFromData(a0, a1, a2, a3, a4, a5);
wine_tsx11_unlock();
return r;
}
int TSXpmAttributesSize(void)
{
int r;
wine_tsx11_lock();
r = XpmAttributesSize();
wine_tsx11_unlock();
return r;
}
#endif /* defined(HAVE_LIBXXPM) */