From 3ece9e9002bdfd80aa24627cd495a6b0639e87c6 Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Sat, 27 Dec 2008 19:47:46 +0100
Subject: [PATCH] include: Move the DEFINE_REGS_ENTRYPOINT macros to the dlls
 that use it.

---
 dlls/kernel32/kernel_private.h | 11 +++++++++++
 dlls/ntdll/ntdll_misc.h        | 18 +++++++++++++++---
 include/wine/port.h            | 13 -------------
 3 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/dlls/kernel32/kernel_private.h b/dlls/kernel32/kernel_private.h
index f83b6c38546..18d71b59ee6 100644
--- a/dlls/kernel32/kernel_private.h
+++ b/dlls/kernel32/kernel_private.h
@@ -143,4 +143,15 @@ extern struct winedos_exports
 /* returns directory handle for named objects */
 extern HANDLE get_BaseNamedObjects_handle(void);
 
+/* Register functions */
+
+#ifdef __i386__
+#define DEFINE_REGS_ENTRYPOINT( name, args, pop_args ) \
+    __ASM_GLOBAL_FUNC( name, \
+                       "pushl %eax\n\t" \
+                       "call " __ASM_NAME("__wine_call_from_32_regs") "\n\t" \
+                       ".long " __ASM_NAME("__regs_") #name "-.\n\t" \
+                       ".byte " #args "," #pop_args )
+#endif
+
 #endif
diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h
index 4474f2f9d01..ced68d9bd51 100644
--- a/dlls/ntdll/ntdll_misc.h
+++ b/dlls/ntdll/ntdll_misc.h
@@ -146,6 +146,10 @@ extern void VIRTUAL_SetForceExec( BOOL enable );
 extern void VIRTUAL_UseLargeAddressSpace(void);
 extern struct _KUSER_SHARED_DATA *user_shared_data;
 
+/* completion */
+extern NTSTATUS NTDLL_AddCompletion( HANDLE hFile, ULONG_PTR CompletionValue,
+                                     NTSTATUS CompletionStatus, ULONG Information );
+
 /* code pages */
 extern int ntdll_umbstowcs(DWORD flags, const char* src, int srclen, WCHAR* dst, int dstlen);
 extern int ntdll_wcstoumbs(DWORD flags, const WCHAR* src, int srclen, char* dst, int dstlen,
@@ -210,8 +214,16 @@ static inline struct ntdll_thread_regs *ntdll_get_thread_regs(void)
     return (struct ntdll_thread_regs *)NtCurrentTeb()->SpareBytes1;
 }
 
-/* Completion */
-extern NTSTATUS NTDLL_AddCompletion( HANDLE hFile, ULONG_PTR CompletionValue,
-                                     NTSTATUS CompletionStatus, ULONG Information );
+/* Register functions */
+
+#ifdef __i386__
+#define DEFINE_REGS_ENTRYPOINT( name, args, pop_args ) \
+    __ASM_GLOBAL_FUNC( name, \
+                       "pushl %eax\n\t" \
+                       "call " __ASM_NAME("__wine_call_from_32_regs") "\n\t" \
+                       ".long " __ASM_NAME("__regs_") #name "-.\n\t" \
+                       ".byte " #args "," #pop_args )
+/* FIXME: add support for other CPUs */
+#endif
 
 #endif
diff --git a/include/wine/port.h b/include/wine/port.h
index e445c08e3ee..817f02b76e4 100644
--- a/include/wine/port.h
+++ b/include/wine/port.h
@@ -224,19 +224,6 @@ struct statvfs
 #endif  /* __GNUC__ */
 
 
-/* Register functions */
-
-#ifdef __i386__
-#define DEFINE_REGS_ENTRYPOINT( name, args, pop_args ) \
-    __ASM_GLOBAL_FUNC( name, \
-                       "pushl %eax\n\t" \
-                       "call " __ASM_NAME("__wine_call_from_32_regs") "\n\t" \
-                       ".long " __ASM_NAME("__regs_") #name "-.\n\t" \
-                       ".byte " #args "," #pop_args )
-/* FIXME: add support for other CPUs */
-#endif  /* __i386__ */
-
-
 /****************************************************************
  * Function definitions (only when using libwine_port)
  */