> CVSROOT: /usr/local/lyx/cvsroot > Module name: lyx-devel > Repository: lyx-devel/src/ > Changes by: [EMAIL PROTECTED] 05/02/15 12:04:40 > > Modified files: > lyx-devel/src/: ChangeLog lyxserver.C > > Log message: > Squash MSVC warning "local variable 'fd' used without having > been initialized". > > Patches: > http://www.lyx.org/cgi-bin/viewcvs.cgi/lyx-devel/src/ChangeLog ?r1=1.2120&r2=1.2121 > http://www.lyx.org/cgi-bin/viewcvs.cgi/lyx-devel/src/lyxserver .C?r1=1.59&r2=1.60 > > Complete Diff: > /usr/bin/cvs -f diff -kk -u -r 1.2120 -r 1.2121 src/ChangeLog > /usr/bin/cvs -f diff -kk -u -r 1.59 -r 1.60 src/lyxserver.C >
This makes the application of win32_kludge.diff choke: C:\lyx\trial\lyx-devel>patch -p0 < development\win32\win32_kludge.diff patching file src/DepTable.C patching file src/buffer.C patching file src/cursor.C patching file src/ispell.C patching file src/lyx_cb.C patching file src/lyxserver.C Hunk #2 FAILED at 186. Hunk #3 succeeded at 241 (offset -1 lines). Hunk #4 succeeded at 282 (offset -1 lines). Hunk #5 succeeded at 345 (offset -1 lines). Hunk #6 succeeded at 358 (offset -1 lines). 1 out of 6 hunks FAILED -- saving rejects to file src/lyxserver.C.rej patching file src/lyxsocket.C Hunk #1 succeeded at 69 (offset 1 line). Hunk #2 succeeded at 158 (offset 1 line). Hunk #3 succeeded at 201 (offset 1 line). Hunk #4 succeeded at 225 (offset 1 line). Hunk #5 succeeded at 265 (offset 1 line). patching file src/client/client.C patching file src/frontends/LyXView.C patching file src/frontends/qt2/QLyXKeySym.C patching file src/support/filetools.C Hunk #1 succeeded at 1042 (offset -110 lines). Hunk #2 succeeded at 1087 (offset -110 lines). patching file src/support/forkedcall.C patching file src/support/forkedcall.h patching file src/support/forkedcontr.C patching file src/support/forkedcontr.h patching file src/support/os_win32.C patching file src/support/socktools.C patching file src/support/tempname.C patching file src/support/userinfo.C
