mirror of
https://github.com/reactos/reactos.git
synced 2024-10-08 02:13:56 +00:00
[TWAIN_32]
* Move some inclusions to the main header. * Set the default debugging channel globally through the main header. * Remove inclusions and definitions that already exist in the main header. CORE-7716 svn path=/trunk/; revision=61448
This commit is contained in:
parent
ca9b838eb0
commit
3c0256d2c4
|
@ -19,21 +19,7 @@
|
|||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||
*/
|
||||
|
||||
#include <config.h>
|
||||
|
||||
//#include <stdlib.h>
|
||||
//#include <stdarg.h>
|
||||
//#include <stdio.h>
|
||||
|
||||
#define NONAMELESSUNION
|
||||
#define NONAMELESSSTRUCT
|
||||
//#include "windef.h"
|
||||
//#include "winbase.h"
|
||||
//#include "twain.h"
|
||||
#include "twain_i.h"
|
||||
#include <wine/debug.h>
|
||||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(twain);
|
||||
|
||||
static TW_UINT16 DSM_initialized; /* whether Source Manager is initialized */
|
||||
static TW_UINT32 DSM_sourceId; /* source id generator */
|
||||
|
|
|
@ -19,17 +19,7 @@
|
|||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||
*/
|
||||
|
||||
#include <config.h>
|
||||
|
||||
#include <stdarg.h>
|
||||
|
||||
#include <windef.h>
|
||||
#include <winbase.h>
|
||||
//#include "twain.h"
|
||||
#include "twain_i.h"
|
||||
#include <wine/debug.h>
|
||||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(twain);
|
||||
|
||||
/* A helper function that looks up a destination identity in the active
|
||||
source list */
|
||||
|
|
|
@ -20,15 +20,19 @@
|
|||
#ifndef _TWAIN32_H
|
||||
#define _TWAIN32_H
|
||||
|
||||
#ifndef __WINE_CONFIG_H
|
||||
# error You must include config.h first
|
||||
#endif
|
||||
#include <config.h>
|
||||
|
||||
#include <stdarg.h>
|
||||
|
||||
#include "windef.h"
|
||||
#include "winbase.h"
|
||||
#include "twain.h"
|
||||
#define NONAMELESSUNION
|
||||
#define NONAMELESSSTRUCT
|
||||
|
||||
#include <windef.h>
|
||||
#include <winbase.h>
|
||||
#include <twain.h>
|
||||
|
||||
#include <wine/debug.h>
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(twain);
|
||||
|
||||
/* internal information about an active data source */
|
||||
typedef struct tagActiveDS
|
||||
|
|
Loading…
Reference in a new issue