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

Non-X11 compile fix for generated code.

This commit is contained in:
Patrik Stridvall 1999-02-04 10:51:35 +00:00 committed by Alexandre Julliard
parent e8c89484e8
commit 48b5de8388
15 changed files with 154 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/ts_xf86dga.h
View File

@ -9,6 +9,12 @@
#ifndef __WINE_TSXF86DGA_H
#define __WINE_TSXF86DGA_H
#include "config.h"
#ifndef X_DISPLAY_MISSING
#ifdef HAVE_LIBXXF86DGA
#include <X11/Xlib.h>
#include <X11/extensions/xf86dga.h>
@ -22,4 +28,8 @@ extern Status TSXF86DGAInstallColormap(Display*,int,Colormap);
extern Status TSXF86DGAQueryDirectVideo(Display*,int,int*);
extern Status TSXF86DGAViewPortChanged(Display*,int,int);
#endif /* defined(HAVE_LIBXXF86DGA) */
#endif /* !defined(X_DISPLAY_MISSING) */
#endif /* __WINE_TSXF86DGA_H */

12
include/ts_xf86vmode.h
View File

@ -9,6 +9,14 @@
#ifndef __WINE_TSXF86VMODE_H
#define __WINE_TSXF86VMODE_H
#include "config.h"
#ifndef X_DISPLAY_MISSING
#include "wintypes.h"
#ifdef HAVE_LIBXXF86VM
#define XMD_H
#include <X11/Xlib.h>
#include <X11/extensions/xf86vmode.h>
@ -27,4 +35,8 @@ extern Bool TSXF86VidModeGetMonitor(Display*,int,XF86VidModeMonitor*);
extern Bool TSXF86VidModeGetViewPort(Display*,int,int*,int*);
extern Bool TSXF86VidModeSetViewPort(Display*,int,int,int);
#endif /* defined(HAVE_LIBXXF86VM) */
#endif /* !defined(X_DISPLAY_MISSING) */
#endif /* __WINE_TSXF86VMODE_H */

8
include/ts_xlib.h
View File

@ -9,6 +9,11 @@
#ifndef __WINE_TSXLIB_H
#define __WINE_TSXLIB_H
#include "config.h"
#ifndef X_DISPLAY_MISSING
#include <X11/Xlib.h>
extern XFontStruct * TSXLoadQueryFont(Display*, const char*);
@ -129,4 +134,7 @@ extern XIM TSXOpenIM(Display*, struct _XrmHashBucketRec*, char*, char*);
extern int (*TSXSynchronize(Display *, Bool))(Display *);
extern void TS_XInitImageFuncPtrs(XImage *);
#endif /* !defined(X_DISPLAY_MISSING) */
#endif /* __WINE_TSXLIB_H */

10
include/ts_xpm.h
View File

@ -9,9 +9,19 @@
#ifndef __WINE_TSXPM_H
#define __WINE_TSXPM_H
#include "config.h"
#ifndef X_DISPLAY_MISSING
#ifdef HAVE_LIBXXPM
#include <X11/xpm.h>
extern int TSXpmCreatePixmapFromData(Display *, Drawable, char **, Pixmap *, Pixmap *, XpmAttributes *);
extern int TSXpmAttributesSize(void);
#endif /* defined(HAVE_LIBXXPM) */
#endif /* !defined(X_DISPLAY_MISSING) */
#endif /* __WINE_TSXPM_H */

8
include/ts_xresource.h
View File

@ -9,6 +9,11 @@
#ifndef __WINE_TSXRESOURCE_H
#define __WINE_TSXRESOURCE_H
#include "config.h"
#ifndef X_DISPLAY_MISSING
#include <X11/Xlib.h>
#include <X11/Xresource.h>
@ -19,4 +24,7 @@ extern XrmDatabase TSXrmGetStringDatabase(const char*);
extern void TSXrmMergeDatabases(XrmDatabase, XrmDatabase*);
extern void TSXrmParseCommand(XrmDatabase*, XrmOptionDescList, int, const char*, int*, char**);
#endif /* !defined(X_DISPLAY_MISSING) */
#endif /* __WINE_TSXRESOURCE_H */

10
include/ts_xshm.h
View File

@ -9,6 +9,12 @@
#ifndef __WINE_TSXSHM_H
#define __WINE_TSXSHM_H
#include "config.h"
#ifndef X_DISPLAY_MISSING
#ifdef HAVE_LIBXXSHM
#include <X11/Xlib.h>
#include <X11/extensions/XShm.h>
@ -22,4 +28,8 @@ extern Status TSXShmGetImage(Display *, Drawable, XImage *, int, int, unsigned l
extern XImage * TSXShmCreateImage(Display *, Visual *, unsigned int, int, char *, XShmSegmentInfo *, unsigned int, unsigned int);
extern Pixmap TSXShmCreatePixmap(Display *, Drawable, char *, XShmSegmentInfo *, unsigned int, unsigned int, unsigned int);
#endif /* defined(HAVE_LIBXXSHM) */
#endif /* !defined(X_DISPLAY_MISSING) */
#endif /* __WINE_TSXSHM_H */

8
include/ts_xutil.h
View File

@ -9,6 +9,11 @@
#ifndef __WINE_TSXUTIL_H
#define __WINE_TSXUTIL_H
#include "config.h"
#ifndef X_DISPLAY_MISSING
#include <X11/Xlib.h>
#include <X11/Xresource.h>
#include <X11/Xutil.h>
@ -47,4 +52,7 @@ extern struct _XImage * TSXSubImage(struct _XImage *, int, int, unsigned int, un
extern int TSXAddPixel(struct _XImage *, long);
extern XContext TSXUniqueContext(void);
#endif /* !defined(X_DISPLAY_MISSING) */
#endif /* __WINE_TSXUTIL_H */

29
tools/make_X11wrappers
View File

@ -54,17 +54,23 @@ foreach $name (@dolist) {
if($name eq "xf86dga") {
$x11_incl = "#include <X11/Xlib.h>\n";
$extensions_dir = "extensions/";
$pre_file = "#include \"config.h\"\n#ifdef HAVE_LIBXXF86DGA\n";
$post_file = "#endif";
$pre_file = "#ifdef HAVE_LIBXXF86DGA\n";
$post_file = "#endif /* defined(HAVE_LIBXXF86DGA) */\n";
}
if($name eq "XShm") {
$extensions_dir = "extensions/";
$pre_file = "#ifdef 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") {
$x11_incl = "#include <X11/Xlib.h>\n";
$extensions_dir = "extensions/";
$pre_file = "#include \"wintypes.h\"\n#ifdef HAVE_LIBXXF86VM\n#define XMD_H\n";
$post_file = "#endif";
$post_file = "#endif /* defined(HAVE_LIBXXF86VM) */\n";
}
print OUTH <<END;
@ -79,6 +85,11 @@ foreach $name (@dolist) {
#ifndef __WINE_TS$ucname\_H
#define __WINE_TS$ucname\_H
#include "config.h"
#ifndef X_DISPLAY_MISSING
$pre_file
$x11_incl#include <X11/$extensions_dir$name.h>
END
@ -89,10 +100,15 @@ END
* This file was generated automatically by tools/make_X11wrappers
* DO NOT EDIT!
*/
#include "config.h"
#ifndef X_DISPLAY_MISSING
$pre_file
$x11_incl#include <X11/$extensions_dir$name.h>
#include "x11drv.h"
#include "debug.h"
#include "x11drv.h"
END
if($name eq "xpm") { # Handle as special case.
@ -323,10 +339,15 @@ END
print OUTH <<END;
$post_file
#endif /* !defined(X_DISPLAY_MISSING) */
#endif /* __WINE_TS$ucname\_H */
END
print OUTC <<END;
$post_file
#endif /* !defined(X_DISPLAY_MISSING) */
END

11
tsx11/ts_xf86dga.c
View File

@ -3,13 +3,17 @@
* This file was generated automatically by tools/make_X11wrappers
* DO NOT EDIT!
*/
#include "config.h"
#ifndef X_DISPLAY_MISSING
#ifdef HAVE_LIBXXF86DGA
#include <X11/Xlib.h>
#include <X11/extensions/xf86dga.h>
#include "x11drv.h"
#include "debug.h"
#include "x11drv.h"
Bool TSXF86DGAQueryVersion(Display*a0,int*a1,int*a2)
{
@ -109,4 +113,7 @@ Status TSXF86DGAViewPortChanged(Display*a0,int a1,int a2)
TRACE(x11, "Ret XF86DGAViewPortChanged\n");
return r;
}
#endif
#endif /* defined(HAVE_LIBXXF86DGA) */
#endif /* !defined(X_DISPLAY_MISSING) */

12
tsx11/ts_xf86vmode.c
View File

@ -3,14 +3,19 @@
* This file was generated automatically by tools/make_X11wrappers
* DO NOT EDIT!
*/
#include "config.h"
#ifndef X_DISPLAY_MISSING
#include "wintypes.h"
#ifdef HAVE_LIBXXF86VM
#define XMD_H
#include <X11/Xlib.h>
#include <X11/extensions/xf86vmode.h>
#include "x11drv.h"
#include "debug.h"
#include "x11drv.h"
Bool TSXF86VidModeQueryVersion(Display*a0,int*a1,int*a2)
{
@ -165,4 +170,7 @@ Bool TSXF86VidModeSetViewPort(Display*a0,int a1,int a2,int a3)
TRACE(x11, "Ret XF86VidModeSetViewPort\n");
return r;
}
#endif
#endif /* defined(HAVE_LIBXXF86VM) */
#endif /* !defined(X_DISPLAY_MISSING) */

9
tsx11/ts_xlib.c
View File

@ -4,9 +4,14 @@
* DO NOT EDIT!
*/
#include "config.h"
#ifndef X_DISPLAY_MISSING
#include <X11/Xlib.h>
#include "x11drv.h"
#include "debug.h"
#include "x11drv.h"
XFontStruct * TSXLoadQueryFont(Display* a0, const char* a1)
{
@ -1293,3 +1298,5 @@ void TS_XInitImageFuncPtrs(XImage *a0)
TRACE(x11, "Ret _XInitImageFuncPtrs\n");
}
#endif /* !defined(X_DISPLAY_MISSING) */

11
tsx11/ts_xpm.c
View File

@ -4,9 +4,15 @@
* DO NOT EDIT!
*/
#include "config.h"
#ifndef X_DISPLAY_MISSING
#ifdef HAVE_LIBXXPM
#include <X11/xpm.h>
#include "x11drv.h"
#include "debug.h"
#include "x11drv.h"
int TSXpmCreatePixmapFromData(Display *a0, Drawable a1, char **a2, Pixmap *a3, Pixmap *a4, XpmAttributes *a5)
{
@ -30,3 +36,6 @@ int TSXpmAttributesSize(void)
return r;
}
#endif /* defined(HAVE_LIBXXPM) */
#endif /* !defined(X_DISPLAY_MISSING) */

9
tsx11/ts_xresource.c
View File

@ -4,10 +4,15 @@
* DO NOT EDIT!
*/
#include "config.h"
#ifndef X_DISPLAY_MISSING
#include <X11/Xlib.h>
#include <X11/Xresource.h>
#include "x11drv.h"
#include "debug.h"
#include "x11drv.h"
XrmQuark TSXrmUniqueQuark(void)
{
@ -71,3 +76,5 @@ void TSXrmParseCommand(XrmDatabase* a0, XrmOptionDescList a1, int a2, const ch
TRACE(x11, "Ret XrmParseCommand\n");
}
#endif /* !defined(X_DISPLAY_MISSING) */

11
tsx11/ts_xshm.c
View File

@ -4,10 +4,16 @@
* DO NOT EDIT!
*/
#include "config.h"
#ifndef X_DISPLAY_MISSING
#ifdef HAVE_LIBXXSHM
#include <X11/Xlib.h>
#include <X11/extensions/XShm.h>
#include "x11drv.h"
#include "debug.h"
#include "x11drv.h"
Bool TSXShmQueryExtension(Display *a0)
{
@ -108,3 +114,6 @@ Pixmap TSXShmCreatePixmap(Display *a0, Drawable a1, char *a2, XShmSegmentInfo *a
return r;
}
#endif /* defined(HAVE_LIBXXSHM) */
#endif /* !defined(X_DISPLAY_MISSING) */

9
tsx11/ts_xutil.c
View File

@ -4,11 +4,16 @@
* DO NOT EDIT!
*/
#include "config.h"
#ifndef X_DISPLAY_MISSING
#include <X11/Xlib.h>
#include <X11/Xresource.h>
#include <X11/Xutil.h>
#include "x11drv.h"
#include "debug.h"
#include "x11drv.h"
XClassHint * TSXAllocClassHint(void)
{
@ -369,3 +374,5 @@ XContext TSXUniqueContext(void)
return r;
}
#endif /* !defined(X_DISPLAY_MISSING) */