X-Git-Url: https://git.hcoop.net/bpt/emacs.git/blobdiff_plain/3f715d17fef56ee78a3df7ebb00d4e8b1aec37de..a8e7d6d783219972c08fd49a3a2afaf26eb139c2:/src/unexw32.c diff --git a/src/unexw32.c b/src/unexw32.c index 74ddd483b7..52b2ec4bf2 100644 --- a/src/unexw32.c +++ b/src/unexw32.c @@ -1,6 +1,5 @@ /* unexec for GNU Emacs on Windows NT. - Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005, - 2006, 2007, 2008 Free Software Foundation, Inc. + Copyright (C) 1994, 2001-2012 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -22,6 +21,7 @@ along with GNU Emacs. If not, see . */ */ #include +#include "unexec.h" #include #include @@ -123,8 +123,8 @@ _start (void) is finished. */ #ifdef HAVE_NTGUI /* determine WinMain args like crt0.c does */ - hinst = GetModuleHandle(NULL); - lpCmdLine = GetCommandLine(); + hinst = GetModuleHandle (NULL); + lpCmdLine = GetCommandLine (); nCmdShow = SW_SHOWDEFAULT; #endif mainCRTStartup (); @@ -326,7 +326,7 @@ relocate_offset (DWORD offset, #define PTR_TO_RVA(ptr) ((DWORD)(ptr) - (DWORD) GetModuleHandle (NULL)) #define RVA_TO_PTR(var,section,filedata) \ - ((void *)(RVA_TO_OFFSET(var,section) + (filedata).file_base)) + ((void *)(RVA_TO_OFFSET (var,section) + (filedata).file_base)) #define PTR_TO_OFFSET(ptr, pfile_data) \ ((unsigned char *)(ptr) - (pfile_data)->file_base) @@ -341,7 +341,6 @@ get_section_info (file_data *p_infile) { PIMAGE_DOS_HEADER dos_header; PIMAGE_NT_HEADERS nt_header; - PIMAGE_SECTION_HEADER section; int overlap; dos_header = (PIMAGE_DOS_HEADER) p_infile->file_base; @@ -725,8 +724,7 @@ copy_executable_and_dump_data (file_data *p_infile, /* Dump out .data and .bss sections into a new executable. */ void -unexec (char *new_name, char *old_name, void *start_data, void *start_bss, - void *entry_address) +unexec (const char *new_name, const char *old_name) { file_data in_file, out_file; char out_filename[MAX_PATH], in_filename[MAX_PATH]; @@ -824,6 +822,3 @@ unexec (char *new_name, char *old_name, void *start_data, void *start_bss, } /* eof */ - -/* arch-tag: fe1d3d1c-ef88-4917-ab22-f12ab16b3254 - (do not change this comment) */