Module: wine Branch: master Commit: 3346132a0b83d4a46ffbcc4e6911ed21f8710be6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3346132a0b83d4a46ffbcc4e6...
Author: Alexandre Julliard julliard@winehq.org Date: Tue May 14 13:52:31 2019 +0200
winecrt0: Don't build unneeded code for Windows platforms.
Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/winecrt0/delay_load.c | 4 ++++ dlls/winecrt0/dll_entry.c | 4 ++++ dlls/winecrt0/drv_entry.c | 4 ++++ dlls/winecrt0/exe16_entry.c | 4 ++-- dlls/winecrt0/exe_entry.c | 4 ++++ dlls/winecrt0/exe_main.c | 4 ++++ dlls/winecrt0/exe_wentry.c | 4 ++++ dlls/winecrt0/exe_wmain.c | 4 ++++ dlls/winecrt0/init.c | 4 ++++ 9 files changed, 34 insertions(+), 2 deletions(-)
diff --git a/dlls/winecrt0/delay_load.c b/dlls/winecrt0/delay_load.c index ac257ba..aab4079 100644 --- a/dlls/winecrt0/delay_load.c +++ b/dlls/winecrt0/delay_load.c @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#ifndef _WIN32 + #include <stdarg.h> #include "windef.h" #include "winbase.h" @@ -61,3 +63,5 @@ static void free_delay_imports(void) if (*descr->phmod) FreeLibrary( *descr->phmod ); } #endif + +#endif /* _WIN32 */ diff --git a/dlls/winecrt0/dll_entry.c b/dlls/winecrt0/dll_entry.c index 9bbe8c4..591aa07 100644 --- a/dlls/winecrt0/dll_entry.c +++ b/dlls/winecrt0/dll_entry.c @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#ifndef _WIN32 + #include <stdarg.h> #include "windef.h" #include "winbase.h" @@ -43,3 +45,5 @@ BOOL WINAPI DECLSPEC_HIDDEN __wine_spec_dll_entry( HINSTANCE inst, DWORD reason,
return ret; } + +#endif /* _WIN32 */ diff --git a/dlls/winecrt0/drv_entry.c b/dlls/winecrt0/drv_entry.c index 32a87ee..4750168 100644 --- a/dlls/winecrt0/drv_entry.c +++ b/dlls/winecrt0/drv_entry.c @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#ifndef _WIN32 + #include <stdarg.h> #include "windef.h" #include "winternl.h" @@ -35,3 +37,5 @@ NTSTATUS DECLSPEC_HIDDEN WINAPI __wine_spec_drv_entry( struct _DRIVER_OBJECT *ob return DriverEntry( obj, path ); /* there is no detach routine so we can't call destructors */ } + +#endif /* _WIN32 */ diff --git a/dlls/winecrt0/exe16_entry.c b/dlls/winecrt0/exe16_entry.c index 2599332..1e477bd 100644 --- a/dlls/winecrt0/exe16_entry.c +++ b/dlls/winecrt0/exe16_entry.c @@ -18,14 +18,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#if defined(__i386__) && !defined(_WIN32) + #include <stdarg.h> #include "windef.h" #include "winbase.h" #include "wownt32.h" #include "wine/winbase16.h"
-#ifdef __i386__ - extern WORD WINAPI WinMain16( HINSTANCE16 inst, HINSTANCE16 prev, LPSTR cmdline, WORD show );
void WINAPI DECLSPEC_HIDDEN __wine_spec_exe16_entry( CONTEXT *context ) diff --git a/dlls/winecrt0/exe_entry.c b/dlls/winecrt0/exe_entry.c index 4165651..60c11aa 100644 --- a/dlls/winecrt0/exe_entry.c +++ b/dlls/winecrt0/exe_entry.c @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#ifndef _WIN32 + #include <stdarg.h> #include "windef.h" #include "winbase.h" @@ -37,3 +39,5 @@ DWORD WINAPI DECLSPEC_HIDDEN __wine_spec_exe_entry( PEB *peb ) if (needs_init) _fini(); ExitProcess( ret ); } + +#endif /* _WIN32 */ diff --git a/dlls/winecrt0/exe_main.c b/dlls/winecrt0/exe_main.c index 89ffa7b..94a96d1 100644 --- a/dlls/winecrt0/exe_main.c +++ b/dlls/winecrt0/exe_main.c @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#ifndef _WIN32 + #include <stdarg.h> #include "windef.h" #include "winbase.h" @@ -48,3 +50,5 @@ int main( int argc, char *argv[] ) if (!(info.dwFlags & STARTF_USESHOWWINDOW)) info.wShowWindow = SW_SHOWNORMAL; return WinMain( GetModuleHandleA(0), 0, cmdline, info.wShowWindow ); } + +#endif /* _WIN32 */ diff --git a/dlls/winecrt0/exe_wentry.c b/dlls/winecrt0/exe_wentry.c index 11cff89..ed1bd20 100644 --- a/dlls/winecrt0/exe_wentry.c +++ b/dlls/winecrt0/exe_wentry.c @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#ifndef _WIN32 + #include <stdarg.h> #include "windef.h" #include "winbase.h" @@ -37,3 +39,5 @@ DWORD WINAPI DECLSPEC_HIDDEN __wine_spec_exe_wentry( PEB *peb ) if (needs_init) _fini(); ExitProcess( ret ); } + +#endif /* _WIN32 */ diff --git a/dlls/winecrt0/exe_wmain.c b/dlls/winecrt0/exe_wmain.c index ce685f8..d697e90 100644 --- a/dlls/winecrt0/exe_wmain.c +++ b/dlls/winecrt0/exe_wmain.c @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#ifndef _WIN32 + #include <stdarg.h> #include "windef.h" #include "winbase.h" @@ -50,3 +52,5 @@ int wmain( int argc, WCHAR *argv[] ) if (!(info.dwFlags & STARTF_USESHOWWINDOW)) info.wShowWindow = SW_SHOWNORMAL; return wWinMain( GetModuleHandleW(0), 0, cmdline, info.wShowWindow ); } + +#endif /* _WIN32 */ diff --git a/dlls/winecrt0/init.c b/dlls/winecrt0/init.c index 74eca43..bd9d9fc 100644 --- a/dlls/winecrt0/init.c +++ b/dlls/winecrt0/init.c @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#ifndef _WIN32 + #include <stdarg.h> #include "windef.h" #include "winbase.h" @@ -40,3 +42,5 @@ void DECLSPEC_HIDDEN __wine_spec_init_ctor(void) if (__wine_spec_init_state == NO_INIT_DONE) __wine_spec_init(); __wine_spec_init_state = CONSTRUCTORS_DONE; } + +#endif /* _WIN32 */
-
Alexandre Julliard