Tried another kludge for the Xmd.h problem.

This commit is contained in:
Alexandre Julliard 1998-12-08 15:06:38 +00:00
parent 399931a293
commit e9bc26ad27
3 changed files with 7 additions and 7 deletions

View File

@ -21,16 +21,15 @@
#include <fcntl.h> #include <fcntl.h>
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
#include "windows.h"
#ifdef HAVE_LIBXXF86VM #ifdef HAVE_LIBXXF86VM
/* X is retarted and insists on declaring INT32, INT16 etc in Xmd.h, this is a crude hack to get around it */ /* X is retarted and insists on declaring INT32, INT16 etc in Xmd.h,
/* Anywhere ts_xf86vmode.h is included you must define LONG64 also, see include/wintypes.h */ this is a crude hack to get around it */
#define LONG64 #define XMD_H
#include "ts_xf86vmode.h" #include "ts_xf86vmode.h"
#undef LONG64
#endif #endif
#include "windows.h"
#include "winerror.h" #include "winerror.h"
#include "interfaces.h" #include "interfaces.h"
#include "gdi.h" #include "gdi.h"

View File

@ -63,7 +63,7 @@ foreach $name (@dolist) {
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/";
$pre_file = "#include \"config.h\"\n#ifdef HAVE_LIBXXF86VM\n"; $pre_file = "#include \"wintypes.h\"\n#ifdef HAVE_LIBXXF86VM\n#define XMD_H\n";
$post_file = "#endif"; $post_file = "#endif";
} }

View File

@ -3,8 +3,9 @@
* This file was generated automatically by tools/make_X11wrappers * This file was generated automatically by tools/make_X11wrappers
* DO NOT EDIT! * DO NOT EDIT!
*/ */
#include "config.h" #include "wintypes.h"
#ifdef HAVE_LIBXXF86VM #ifdef HAVE_LIBXXF86VM
#define XMD_H
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <X11/extensions/xf86vmode.h> #include <X11/extensions/xf86vmode.h>