libwine: Remove wine/library.h.

dlls/kernel32/profile.c

@@ -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);

dlls/mscms/mscms_main.c

@@ -22,7 +22,6 @@
 
 #include "wine/port.h"
 #include "wine/debug.h"
-#include "wine/library.h"
 
 #include <stdarg.h>
 

dlls/opencl/opencl.c

@@ -26,7 +26,6 @@
 #include "winbase.h"
 
 #include "wine/debug.h"
-#include "wine/library.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(opencl);
 

dlls/winecoreaudio.drv/coreaudio.c

@@ -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);

include/Makefile.in

@@ -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 \

include/wine/library.h

-/*
- * Definitions for the Wine library
- *
- * Copyright 2000 Alexandre Julliard
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-#ifndef __WINE_WINE_LIBRARY_H
-#define __WINE_WINE_LIBRARY_H
-
-#include <stdarg.h>
-#include <sys/types.h>
-
-#include <windef.h>
-#include <winbase.h>
-
-#ifdef __WINE_WINE_TEST_H
-#error This file should not be used in Wine tests
-#endif
-
-#ifdef __WINE_USE_MSVCRT
-#error This file should not be used with msvcrt headers
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* configuration */
-
-extern void wine_init_argv0_path( const char *argv0 );
-extern void wine_exec_wine_binary( const char *name, char **argv, const char *env_var );
-
-/* dll loading */
-
-typedef void (*load_dll_callback_t)( void *, const char * );
-extern void wine_dll_set_callback( load_dll_callback_t load );
-extern void __wine_dll_register( const IMAGE_NT_HEADERS *header, const char *filename );
-extern void wine_init( int argc, char *argv[], char *error, int error_size );
-
-/* memory mappings */
-
-extern void *wine_anon_mmap( void *start, size_t size, int prot, int flags );
-extern void wine_mmap_add_reserved_area( void *addr, size_t size );
-extern void wine_mmap_remove_reserved_area( void *addr, size_t size, int unmap );
-extern int wine_mmap_is_in_reserved_area( void *addr, size_t size );
-extern int wine_mmap_enum_reserved_areas( int (*enum_func)(void *base, size_t size, void *arg),
-                                          void *arg, int top_down );
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  /* __WINE_WINE_LIBRARY_H */

include/wine/test.h

@@ -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

libs/wine/config.c

@@ -41,7 +41,6 @@
 #endif
 #endif
 #include "wine/asm.h"
-#include "wine/library.h"
 
 static char *bindir;
 static char *dlldir;

libs/wine/debug.c

@@ -34,7 +34,6 @@
 #endif
 
 #include "wine/debug.h"
-#include "wine/library.h"
 
 struct __wine_debug_functions
 {

libs/wine/loader.c

@@ -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;
@@ -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;
@@ -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 );
 

libs/wine/mmap.c

@@ -42,7 +42,6 @@
 # include <stdint.h>
 #endif
 
-#include "wine/library.h"
 #include "wine/list.h"
 
 struct reserved_area
@@ -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;

libs/wine/port.c

@@ -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 */

programs/winecfg/drive.c

@@ -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"

programs/winedbg/winedbg.c

@@ -27,7 +27,6 @@
 
 #include "winternl.h"
 #include "wine/exception.h"
-#include "wine/library.h"
 
 #include "wine/debug.h"
 

tools/make_makefiles

@@ -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,
 );