From: Daniel Reimer Date: Mon, 4 May 2015 23:08:17 +0000 (+0000) Subject: [ROSAPPS] X-Git-Tag: backups/colins-printing-for-freedom@73041~24^2~157 X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=26aa5486a1255fa8bdf7207eac391e50fb6bf87d [ROSAPPS] Fix symdump, ncftp and netreg MSVC build. svn path=/trunk/; revision=67548 --- diff --git a/rosapps/applications/devutils/symdump/CMakeLists.txt b/rosapps/applications/devutils/symdump/CMakeLists.txt index ffaddf02dc3..14c53460d04 100644 --- a/rosapps/applications/devutils/symdump/CMakeLists.txt +++ b/rosapps/applications/devutils/symdump/CMakeLists.txt @@ -3,7 +3,7 @@ include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine) add_executable(symdump symdump.c) set_module_type(symdump win32cui) target_link_libraries(symdump wine) -add_importlibs(symdump dbghelp shlwapi msvcrt kernel32) +add_importlibs(symdump dbghelp shlwapi msvcrt kernel32 ntdll) if(NOT MSVC) add_target_compile_flags(symdump "-Wno-unused-but-set-variable") endif() diff --git a/rosapps/applications/net/ncftp/libncftp/ftp.c b/rosapps/applications/net/ncftp/libncftp/ftp.c index 9c24d26de82..ecddc7a690f 100644 --- a/rosapps/applications/net/ncftp/libncftp/ftp.c +++ b/rosapps/applications/net/ncftp/libncftp/ftp.c @@ -10,8 +10,8 @@ char gLibNcFTPVersion[64] = kLibraryVersion; -/* #ifdef NO_SIGNALS -static char gNoSignalsMarker[] = "@(#) LibNcFTP - NO_SIGNALS"; +#ifdef NO_SIGNALS +char gNoSignalsMarker[] = "@(#) LibNcFTP - NO_SIGNALS"; #else static int gGotSig = 0; @@ -21,7 +21,7 @@ static sigjmp_buf gCancelConnectJmp; static jmp_buf gCancelConnectJmp; #endif -#endif */ +#endif #ifndef lint diff --git a/rosapps/applications/net/ncftp/sio/syshdrs.h b/rosapps/applications/net/ncftp/sio/syshdrs.h index 5279757433b..53da630558f 100644 --- a/rosapps/applications/net/ncftp/sio/syshdrs.h +++ b/rosapps/applications/net/ncftp/sio/syshdrs.h @@ -14,7 +14,7 @@ # include "wincfg.h" # include /* includes */ # include -# define _POSIX_ 1 +//# define _POSIX_ 1 # ifdef HAVE_UNISTD_H # include # endif diff --git a/rosapps/applications/net/netreg/CMakeLists.txt b/rosapps/applications/net/netreg/CMakeLists.txt index a646064a700..ce7e2fc6af3 100644 --- a/rosapps/applications/net/netreg/CMakeLists.txt +++ b/rosapps/applications/net/netreg/CMakeLists.txt @@ -2,5 +2,5 @@ set_cpp(WITH_RUNTIME WITH_STL) add_executable(netreg netreg.cpp netreg.rc) set_module_type(netreg win32cui) -add_importlibs(netreg advapi32 user32 ws2_32 msvcrt kernel32) +add_importlibs(netreg advapi32 user32 ws2_32 msvcrt kernel32 ntdll) add_cd_file(TARGET netreg DESTINATION reactos/system32 FOR all)