Reorder header files to avoid name space collision with symbol
PAGESIZE.
This commit is contained in:
parent
8fca00e030
commit
0989cfae25
|
@ -26,26 +26,28 @@
|
||||||
#ifdef HAVE_UNISTD_H
|
#ifdef HAVE_UNISTD_H
|
||||||
# include <unistd.h>
|
# include <unistd.h>
|
||||||
#endif
|
#endif
|
||||||
|
#ifdef HAVE_CUPS_CUPS_H
|
||||||
|
# include <cups/cups.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
#define NONAMELESSUNION
|
#define NONAMELESSUNION
|
||||||
#define NONAMELESSSTRUCT
|
#define NONAMELESSSTRUCT
|
||||||
#include "psdrv.h"
|
|
||||||
#include "wine/debug.h"
|
#include "wine/debug.h"
|
||||||
#include "winreg.h"
|
|
||||||
#include "winspool.h"
|
|
||||||
#include "winerror.h"
|
#include "winerror.h"
|
||||||
#include "wownt32.h"
|
#include "wownt32.h"
|
||||||
#include "heap.h"
|
#include "heap.h"
|
||||||
|
#include "winreg.h"
|
||||||
|
#include "psdrv.h"
|
||||||
|
#include "winspool.h"
|
||||||
|
|
||||||
WINE_DEFAULT_DEBUG_CHANNEL(psdrv);
|
WINE_DEFAULT_DEBUG_CHANNEL(psdrv);
|
||||||
|
|
||||||
#ifdef HAVE_CUPS_CUPS_H
|
|
||||||
#include <cups/cups.h>
|
|
||||||
|
|
||||||
#ifndef SONAME_LIBCUPS
|
#ifndef SONAME_LIBCUPS
|
||||||
#define SONAME_LIBCUPS "libcups.so"
|
#define SONAME_LIBCUPS "libcups.so"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef HAVE_CUPS_CUPS_H
|
||||||
static void *cupshandle = NULL;
|
static void *cupshandle = NULL;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue