|
From: Jason F. <jas...@ya...> - 2001-10-09 22:18:33
|
What's the command line for merging in a diff?
Thanks
- Jason
--- Guido de Jong <gui...@ch...> wrote:
> This patch fixes a warning in file/rw.c in kernel32
> > *** lib/kernel32/file/rw.c 2001/01/16 09:55:02 1.15
> --- lib/kernel32/file/rw.c 2001/10/07 19:26:29
> *************** WINBOOL STDCALL ReadFile(HANDLE hFile,
> *** 148,156 ****
> return(TRUE);
> }
>
> ! VOID ApcRoutine(PVOID ApcContext,
> ! struct _IO_STATUS_BLOCK* IoStatusBlock,
> ! ULONG NumberOfBytesTransfered)
> {
> DWORD dwErrorCode;
> LPOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine =
> --- 148,157 ----
> return(TRUE);
> }
>
> ! VOID STDCALL
> ! ApcRoutine(PVOID ApcContext,
> ! struct _IO_STATUS_BLOCK* IoStatusBlock,
> ! ULONG NumberOfBytesTransfered)
> {
> DWORD dwErrorCode;
> LPOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine =
>
__________________________________________________
Do You Yahoo!?
Make a great connection at Yahoo! Personals.
http://personals.yahoo.com
====================================================
= To remove yourself from this mailing list, go to =
= http://www.reactos.com/home/mailing.html =
====================================================
|