added patch submitted by Guido de Jong

svn path=/trunk/; revision=3481

diff --git a/rosapps/net/ncftp/libncftp/syshdrs.h b/rosapps/net/ncftp/libncftp/syshdrs.h
index 7a123cb..302240d 100644 (file)
--- a/rosapps/net/ncftp/libncftp/syshdrs.h
+++ b/rosapps/net/ncftp/libncftp/syshdrs.h
@@ -225,10 +225,10 @@
 #endif
 
 #if USE_SIO
-#      include "sio\sio.h"                     /* Library header. */
+#      include "sio/sio.h"                     /* Library header. */
 #endif
 
-#include "Strn\Strn.h"                 /* Library header. */
+#include "Strn/Strn.h"                 /* Library header. */
 #include "ncftp.h"                     /* Library header. */
 
 #include "util.h"

diff --git a/rosapps/net/ncftp/makefile b/rosapps/net/ncftp/makefile
index 7bc072d..cae32f5 100644 (file)
--- a/rosapps/net/ncftp/makefile
+++ b/rosapps/net/ncftp/makefile
@@ -1,5 +1,5 @@
 #
-# ncftp 3.0.3 for reactos ported from MS-Vc++
+# ncftp 3.0.3 for reactos ported from MS-Vc
 # sedwards 12-20-01
 
 PATH_TO_TOP=../../../reactos
@@ -18,79 +18,79 @@ TARGET_CLEAN = \
 sio/*.o Strn/*.o libncftp/*.o ncftp/*.o
 
 OBJECTS_SIO = \
-sio\PRead.o \
-sio\PWrite.o \
-sio\SAcceptA.o \
-sio\SAcceptS.o \
-sio\SBind.o \
-sio\SClose.o \
-sio\SConnect.o \
-sio\SConnectByName.o \
-sio\SNew.o \
-sio\SRead.o \
-sio\SReadline.o \
-sio\SRecv.o \
-sio\SRecvfrom.o \
-sio\SRecvmsg.o \
-sio\SSelect.o \
-sio\SSend.o \
-sio\SSendto.o \
-sio\SSendtoByName.o \
-sio\SWrite.o \
-sio\SocketUtil.o \
-sio\StrAddr.o \
-sio\UAcceptA.o \
-sio\UAcceptS.o \
-sio\UBind.o \
-sio\UConnect.o \
-sio\UConnectByName.o \
-sio\UNew.o \
-sio\URecvfrom.o \
-sio\USendto.o \
-sio\USendtoByName.o \
-sio\SError.o \
-sio\main.o \
-sio\SWait.o 
+sio/PRead.o \
+sio/PWrite.o \
+sio/SAcceptA.o \
+sio/SAcceptS.o \
+sio/SBind.o \
+sio/SClose.o \
+sio/SConnect.o \
+sio/SConnectByName.o \
+sio/SNew.o \
+sio/SRead.o \
+sio/SReadline.o \
+sio/SRecv.o \
+sio/SRecvfrom.o \
+sio/SRecvmsg.o \
+sio/SSelect.o \
+sio/SSend.o \
+sio/SSendto.o \
+sio/SSendtoByName.o \
+sio/SWrite.o \
+sio/SocketUtil.o \
+sio/StrAddr.o \
+sio/UAcceptA.o \
+sio/UAcceptS.o \
+sio/UBind.o \
+sio/UConnect.o \
+sio/UConnectByName.o \
+sio/UNew.o \
+sio/URecvfrom.o \
+sio/USendto.o \
+sio/USendtoByName.o \
+sio/SError.o \
+sio/SWait.o \
+sio/main.o
 
 OBJECTS_STRN = \
-Strn\Dynscat.o \
-Strn\Strncpy.o \
-Strn\Strncat.o \
-Strn\Strntok.o \
-Strn\Strnpcpy.o \
-Strn\Strnpcat.o \
-Strn\strtokc.o \
-Strn\version.o 
+Strn/Dynscat.o \
+Strn/Strncpy.o \
+Strn/Strncat.o \
+Strn/Strntok.o \
+Strn/Strnpcpy.o \
+Strn/Strnpcat.o \
+Strn/strtokc.o \
+Strn/version.o 
 
 OBJECTS_LIBNCFTP = \
-libncftp\open.o \
-libncftp\cmds.o \
-libncftp\util.o \
-libncftp\rcmd.o \
-libncftp\ftp.o \
-libncftp\io.o \
-libncftp\errno.o \
-libncftp\linelist.o \
-libncftp\glob.o 
+libncftp/open.o \
+libncftp/cmds.o \
+libncftp/util.o \
+libncftp/rcmd.o \
+libncftp/ftp.o \
+libncftp/io.o \
+libncftp/errno.o \
+libncftp/linelist.o \
+libncftp/glob.o 
 
 OBJECTS_NCFTP = \
-ncftp\cmds.o \
-ncftp\cmdlist.o \
-ncftp\getopt.o \
-ncftp\ls.o \
-ncftp\main.o \
-ncftp\version.o \
-ncftp\shell.o \
-ncftp\util.o \
-ncftp\readln.o \
-ncftp\progress.o \
-ncftp\bookmark.o \
-ncftp\pref.o \
-ncftp\preffw.o \
-ncftp\trace.o \
-ncftp\spool.o \
-ncftp\log.o \
-ncftp\getline.o
+ncftp/cmds.o \
+ncftp/cmdlist.o \
+ncftp/getopt.o \
+ncftp/ls.o \
+ncftp/main.o \
+ncftp/version.o \
+ncftp/shell.o \
+ncftp/util.o \
+ncftp/readln.o \
+ncftp/progress.o \
+ncftp/bookmark.o \
+ncftp/pref.o \
+ncftp/preffw.o \
+ncftp/trace.o \
+ncftp/spool.o \
+ncftp/log.o \
+ncftp/getline.o
 
 TARGET_OBJECTS = \
        $(OBJECTS_SIO) \
@@ -102,4 +102,4 @@ include $(PATH_TO_TOP)/rules.mak
 
 include $(TOOLS_PATH)/helper.mk
 
-# EOF
\ No newline at end of file
+# EOF

diff --git a/rosapps/net/ncftp/ncftp/syshdrs.h b/rosapps/net/ncftp/ncftp/syshdrs.h
index d0efb13..7363754 100644 (file)
--- a/rosapps/net/ncftp/ncftp/syshdrs.h
+++ b/rosapps/net/ncftp/ncftp/syshdrs.h
@@ -190,5 +190,5 @@
 #endif
 
 
-#include "Strn\Strn.h"                 /* Library header. */
-#include "libncftp\ncftp.h"                    /* Library header. */
+#include "Strn/Strn.h"                 /* Library header. */
+#include "libncftp/ncftp.h"                    /* Library header. */