Skip to content

Commit

Permalink
libwine: Remove wine/library.h.
Browse files Browse the repository at this point in the history
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
  • Loading branch information
julliard committed Sep 8, 2020
1 parent 4826900 commit a9a08db
Show file tree
Hide file tree
Showing 15 changed files with 6 additions and 83 deletions.
1 change: 0 additions & 1 deletion dlls/kernel32/profile.c
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
#include "winternl.h"
#include "shlwapi.h"
#include "wine/unicode.h"
#include "wine/library.h"
#include "wine/debug.h"

WINE_DEFAULT_DEBUG_CHANNEL(profile);
Expand Down
1 change: 0 additions & 1 deletion dlls/mscms/mscms_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@

#include "wine/port.h"
#include "wine/debug.h"
#include "wine/library.h"

#include <stdarg.h>

Expand Down
1 change: 0 additions & 1 deletion dlls/opencl/opencl.c
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
#include "winbase.h"

#include "wine/debug.h"
#include "wine/library.h"

WINE_DEFAULT_DEBUG_CHANNEL(opencl);

Expand Down
1 change: 0 additions & 1 deletion dlls/winecoreaudio.drv/coreaudio.c
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
#include "winuser.h"
#include "mmddk.h"
#include "coreaudio.h"
#include "wine/library.h"
#include "wine/debug.h"

WINE_DEFAULT_DEBUG_CHANNEL(coreaudio);
Expand Down
1 change: 0 additions & 1 deletion include/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -739,7 +739,6 @@ SOURCES = \
wine/exception.h \
wine/fil_data.idl \
wine/itss.idl \
wine/library.h \
wine/orpc.idl \
wine/svcctl.idl \
wine/winedxgi.idl \
Expand Down
67 changes: 0 additions & 67 deletions include/wine/library.h

This file was deleted.

3 changes: 0 additions & 3 deletions include/wine/test.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,6 @@
#ifdef __WINE_CONFIG_H
#error config.h should not be used in Wine tests
#endif
#ifdef __WINE_WINE_LIBRARY_H
#error wine/library.h should not be used in Wine tests
#endif
#ifdef __WINE_WINE_UNICODE_H
#error wine/unicode.h should not be used in Wine tests
#endif
Expand Down
1 change: 0 additions & 1 deletion libs/wine/config.c
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
#endif
#endif
#include "wine/asm.h"
#include "wine/library.h"

static char *bindir;
static char *dlldir;
Expand Down
1 change: 0 additions & 1 deletion libs/wine/debug.c
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
#endif

#include "wine/debug.h"
#include "wine/library.h"

struct __wine_debug_functions
{
Expand Down
5 changes: 4 additions & 1 deletion libs/wine/loader.c
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ extern char **environ;
#include "windef.h"
#include "winbase.h"
#include "wine/asm.h"
#include "wine/library.h"

/* argc/argv for the Windows application */
int __wine_main_argc = 0;
Expand Down Expand Up @@ -92,6 +91,7 @@ static int nb_dlls;

static const IMAGE_NT_HEADERS *main_exe;

typedef void (*load_dll_callback_t)( void *, const char * );
static load_dll_callback_t load_dll_callback;

extern const char *build_dir;
Expand All @@ -100,6 +100,9 @@ static const char **dll_paths;
static unsigned int nb_dll_paths;
static int dll_path_maxlen;

extern void *wine_anon_mmap( void *start, size_t size, int prot, int flags );
extern void wine_init_argv0_path( const char *argv0 );
extern void wine_init( int argc, char *argv[], char *error, int error_size );
extern void mmap_init(void);
extern const char *get_dlldir( const char **default_dlldir );

Expand Down
3 changes: 2 additions & 1 deletion libs/wine/mmap.c
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@
# include <stdint.h>
#endif

#include "wine/library.h"
#include "wine/list.h"

struct reserved_area
Expand All @@ -67,6 +66,8 @@ static const unsigned int granularity_mask = 0xffff; /* reserved areas have 64k
#define MAP_ANON 0
#endif

void wine_mmap_add_reserved_area( void *addr, size_t size );

static inline int get_fdzero(void)
{
static int fd = -1;
Expand Down
1 change: 0 additions & 1 deletion libs/wine/port.c
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@

#define WINE_UNICODE_INLINE /* nothing */
#include "wine/unicode.h"
#include "wine/library.h"

/* functions from libwine_port that are also exported from libwine for backwards compatibility,
* on platforms that require it */
Expand Down
1 change: 0 additions & 1 deletion programs/winecfg/drive.c
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@
#include <shlobj.h>
#define WINE_MOUNTMGR_EXTENSIONS
#include <ddk/mountmgr.h>
#include <wine/library.h>

#include "winecfg.h"
#include "resource.h"
Expand Down
1 change: 0 additions & 1 deletion programs/winedbg/winedbg.c
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@

#include "winternl.h"
#include "wine/exception.h"
#include "wine/library.h"

#include "wine/debug.h"

Expand Down
1 change: 0 additions & 1 deletion tools/make_makefiles
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ my %modules16 =
my %exported_wine_headers = (
"wine/debug.h" => 1,
"wine/exception.h" => 1,
"wine/library.h" => 1,
"wine/itss.idl" => 1,
"wine/svcctl.idl" => 1,
);
Expand Down

0 comments on commit a9a08db

Please sign in to comment.