[ros-diffs] [dreimer] 67697: [REDEXPL] This is evil under amd64, too... so we disable it for now. [ROSHTTPD] UINT -> size_t [NCFTP] About time to clean this mess. Are we a Unix? No sir!

Author: dreimer
Date: Tue May 12 18:14:39 2015
New Revision: 67697

URL: http://svn.reactos.org/svn/reactos?rev=67697&view=rev
Log:
[REDEXPL]
This is evil under amd64, too... so we disable it for now.
[ROSHTTPD]
UINT -> size_t
[NCFTP]
About time to clean this mess. Are we a Unix? No sir!

Modified:
    trunk/rosapps/applications/net/ncftp/libncftp/syshdrs.h
    trunk/rosapps/applications/net/ncftp/ncftp/getline.c
    trunk/rosapps/applications/net/ncftp/ncftp/syshdrs.h
    trunk/rosapps/applications/net/ncftp/sio/syshdrs.h
    trunk/rosapps/applications/net/roshttpd/common/list.cpp
    trunk/rosapps/applications/net/roshttpd/include/list.h
    trunk/rosapps/applications/sysutils/CMakeLists.txt

Modified: trunk/rosapps/applications/net/ncftp/libncftp/syshdrs.h
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/net/ncftp/lib…
==============================================================================
--- trunk/rosapps/applications/net/ncftp/libncftp/syshdrs.h	[iso-8859-1] (original)
+++ trunk/rosapps/applications/net/ncftp/libncftp/syshdrs.h	[iso-8859-1] Tue May 12
18:14:39 2015
@@ -9,7 +9,6 @@
 #	include <config.h>
 #endif
 
-#if defined(WIN32) || defined(_WINDOWS)
 #	include "wincfg.h"
 #	include <winsock2.h>	/* Includes <windows.h> */
 //#	include <shlobj.h>
@@ -56,77 +55,6 @@
 #	endif
 #	define NO_SIGNALS 1
 #	define USE_SIO 1
-#else	/* UNIX */
-
-#if defined(AIX) || defined(_AIX)
-#	define _ALL_SOURCE 1
-#endif
-#ifdef HAVE_UNISTD_H
-#	include <unistd.h>
-#endif
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-#include <sys/socket.h>
-#include <sys/ioctl.h>
-#include <sys/wait.h>
-#if !defined(HAVE_GETCWD) && defined(HAVE_GETWD)
-#	include <sys/param.h>
-#endif
-
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <arpa/telnet.h>
-#include <netdb.h>
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-#ifdef HAVE_STRINGS_H
-#	include <strings.h>
-#endif
-#include <stddef.h>
-#include <stdlib.h>
-#include <ctype.h>
-#include <signal.h>
-#include <setjmp.h>
-#include <stdarg.h>
-#include <time.h>
-#include <pwd.h>
-#include <dirent.h>
-#include <fcntl.h>
-
-#ifdef HAVE_NET_ERRNO_H
-#	include <net/errno.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-#	include <arpa/nameser.h>
-#endif
-#ifdef HAVE_NSERVE_H
-#	include <nserve.h>
-#endif
-#ifdef HAVE_RESOLV_H
-#	include <resolv.h>
-#endif
-#ifdef CAN_USE_SYS_SELECT_H
-#	include <sys/select.h>
-#endif
-
-#ifdef HAVE_GETCWD
-#	ifndef HAVE_UNISTD_H
-		extern char *getcwd();
-#	endif
-#else
-#	ifdef HAVE_GETWD
-#		include <sys/param.h>
-#		ifndef MAXPATHLEN
-#			define MAXPATHLEN 1024
-#		endif
-		extern char *getwd(char *);
-#	endif
-#endif
-
-#endif	/* UNIX */
-
 
 #if defined(HAVE_LONG_LONG) && defined(HAVE_OPEN64)
 #	define Open open64

Modified: trunk/rosapps/applications/net/ncftp/ncftp/getline.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/net/ncftp/ncf…
==============================================================================
--- trunk/rosapps/applications/net/ncftp/ncftp/getline.c	[iso-8859-1] (original)
+++ trunk/rosapps/applications/net/ncftp/ncftp/getline.c	[iso-8859-1] Tue May 12 18:14:39
2015
@@ -20,7 +20,6 @@
 
 static const char copyright[] = "getline:  Copyright (C) 1991, 1992, 1993, Chris
Thewalt";
 
-#if defined(WIN32) || defined(_WINDOWS)
 #	include <windows.h>
 #	include <sys/types.h>
 #	include <sys/stat.h>
@@ -59,54 +58,6 @@
 #	define UNC_PATH_PREFIX "\\\\"
 #	define IsUNCPrefixed(s) (IsLocalPathDelim(s[0]) && IsLocalPathDelim(s[1]))
 #	define __windows__ 1
-#else
-#	ifndef __unix__
-#		define __unix__ 1
-#	endif
-#	if defined(AIX) || defined(_AIX)
-#		define _ALL_SOURCE 1
-#	endif
-#	if defined(HAVE_CONFIG_H)
-#		include <config.h>
-#	else
-#		/* guess */
-#		define HAVE_TERMIOS_H 1
-#		define HAVE_UNISTD_H 1
-#	endif
-#	ifdef HAVE_UNISTD_H
-#		include <unistd.h>
-#	endif
-#	include <sys/types.h>
-#	include <sys/time.h>
-#	include <sys/stat.h>
-#	ifdef CAN_USE_SYS_SELECT_H
-#		include <sys/select.h>
-#	endif
-#	include <fcntl.h>
-#	include <errno.h>
-#	include <dirent.h>
-#	include <pwd.h>
-#	ifdef HAVE_TERMIOS_H		/* use HAVE_TERMIOS_H interface */
-#		include <termios.h>
-		struct termios  new_termios, old_termios;
-#	else /* not HAVE_TERMIOS_H */
-#		include <sys/ioctl.h>
-#		ifdef TIOCSETN		/* use BSD interface */
-#			include <sgtty.h>
-			struct sgttyb   new_tty, old_tty;
-			struct tchars   tch;
-			struct ltchars  ltch;
-#		else			/* use SYSV interface */
-#			include <termio.h>
-			struct termio   new_termio, old_termio;
-#		endif /* TIOCSETN */
-#	endif /* HAVE_TERMIOS_H */
-#	define LOCAL_PATH_DELIM '/'
-#	define LOCAL_PATH_DELIM_STR "/"
-#	define _StrFindLocalPathDelim(a) strchr(a, LOCAL_PATH_DELIM)
-#	define _StrRFindLocalPathDelim(a) strrchr(a, LOCAL_PATH_DELIM)
-#	define IsLocalPathDelim(c) (c == LOCAL_PATH_DELIM)
-#endif
 
 /********************* C library headers ********************************/
 

Modified: trunk/rosapps/applications/net/ncftp/ncftp/syshdrs.h
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/net/ncftp/ncf…
==============================================================================
--- trunk/rosapps/applications/net/ncftp/ncftp/syshdrs.h	[iso-8859-1] (original)
+++ trunk/rosapps/applications/net/ncftp/ncftp/syshdrs.h	[iso-8859-1] Tue May 12 18:14:39
2015
@@ -9,7 +9,6 @@
 #	include <config.h>
 #endif
 
-#if defined(WIN32) || defined(_WINDOWS)
 #	define SELECT_TYPE_ARG1 int
 #	define SELECT_TYPE_ARG234 (fd_set *)
 #	define SELECT_TYPE_ARG5 (struct timeval *)
@@ -84,68 +83,6 @@
 #		define FOPEN_WRITE_TEXT "wt"
 #		define FOPEN_APPEND_TEXT "at"
 #	endif
-#else	/* UNIX */
-#	if defined(AIX) || defined(_AIX)
-#		define _ALL_SOURCE 1
-#	endif
-#	ifdef HAVE_UNISTD_H
-#		include <unistd.h>
-#	endif
-#	include <sys/types.h>
-#	include <sys/stat.h>
-#	include <sys/socket.h>
-#	include <sys/wait.h>
-#	ifdef CAN_USE_SYS_SELECT_H
-#		include <sys/select.h>
-#	endif
-#	if defined(HAVE_SYS_UTSNAME_H) && defined(HAVE_UNAME)
-#		include <sys/utsname.h>
-#	endif
-#	include <netinet/in.h>
-#	include <arpa/inet.h>
-#	include <netdb.h>
-#	include <errno.h>
-#	include <stdio.h>
-#	include <string.h>
-#	ifdef HAVE_STRINGS_H
-#		include <strings.h>
-#	endif
-#	include <stddef.h>
-#	include <stdlib.h>
-#	include <ctype.h>
-#	include <signal.h>
-#	include <setjmp.h>
-#	include <stdarg.h>
-#	include <assert.h>
-#	include <time.h>
-#	include <pwd.h>
-#	include <fcntl.h>
-#	if defined(HAVE_SYS_IOCTL_H) && defined(HAVE_TERMIOS_H)
-#		include <sys/ioctl.h>
-#		include <termios.h>
-#	endif
-#	ifdef HAVE_LOCALE_H
-#		include <locale.h>
-#	endif
-#	ifdef HAVE_GETCWD
-#		ifndef HAVE_UNISTD_H
-			extern char *getcwd();
-#		endif
-#	else
-#		ifdef HAVE_GETWD
-#			include <sys/param.h>
-#			ifndef MAXPATHLEN
-#				define MAXPATHLEN 1024
-#			endif
-			extern char *getwd(char *);
-#		endif
-#	endif
-#	ifndef FOPEN_READ_TEXT
-#		define FOPEN_READ_TEXT "r"
-#		define FOPEN_WRITE_TEXT "w"
-#		define FOPEN_APPEND_TEXT "a"
-#	endif
-#endif	/* UNIX */
 
 #ifndef STDIN_FILENO
 #	define STDIN_FILENO    0

Modified: trunk/rosapps/applications/net/ncftp/sio/syshdrs.h
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/net/ncftp/sio…
==============================================================================
--- trunk/rosapps/applications/net/ncftp/sio/syshdrs.h	[iso-8859-1] (original)
+++ trunk/rosapps/applications/net/ncftp/sio/syshdrs.h	[iso-8859-1] Tue May 12 18:14:39
2015
@@ -9,12 +9,10 @@
 #	include "config.h"
 #endif
 
-#if defined(WIN32) || defined(_WINDOWS)
 	/* Include "wincfg.h" in place of "config.h" */
 #	include "wincfg.h"
 #	include <winsock2.h>	/* includes <windows.h> */
 #	include <io.h>
-//#	define _POSIX_ 1
 #	ifdef HAVE_UNISTD_H
 #		include <unistd.h>
 #	endif
@@ -56,77 +54,6 @@
 #	endif
 #	define NO_SIGNALS 1
 #	define NO_UNIX_DOMAIN_SOCKETS 1
-#else	/* UNIX */
-
-#if defined(AIX) || defined(_AIX)
-#	define _ALL_SOURCE 1
-#endif
-#ifdef HAVE_UNISTD_H
-#	include <unistd.h>
-#endif
-#include <sys/types.h>
-#include <sys/time.h>
-#include <sys/stat.h>
-#include <sys/socket.h>
-#include <sys/un.h>
-#include <sys/ioctl.h>
-#if !defined(HAVE_GETCWD) && defined(HAVE_GETWD)
-#	include <sys/param.h>
-#endif
-
-#include <netinet/in.h>
-#include <netinet/tcp.h>
-#include <arpa/inet.h>
-#include <arpa/telnet.h>
-#include <netdb.h>
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-#ifdef HAVE_STRINGS_H
-#	include <strings.h>
-#endif
-#include <stddef.h>
-#include <stdlib.h>
-#include <ctype.h>
-#include <signal.h>
-#include <setjmp.h>
-#include <stdarg.h>
-#include <time.h>
-#include <fcntl.h>
-
-#ifdef HAVE_NET_ERRNO_H
-#	include <net/errno.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-#	include <arpa/nameser.h>
-#endif
-#ifdef HAVE_NSERVE_H
-#	include <nserve.h>
-#endif
-#ifdef HAVE_RESOLV_H
-#	include <resolv.h>
-#endif
-#ifdef CAN_USE_SYS_SELECT_H
-#	include <sys/select.h>
-#endif
-
-#ifdef HAVE_GETCWD
-#	ifndef HAVE_UNISTD_H
-		extern char *getcwd();
-#	endif
-#else
-#	ifdef HAVE_GETWD
-#		include <sys/param.h>
-#		ifndef MAXPATHLEN
-#			define MAXPATHLEN 1024
-#		endif
-		extern char *getwd(char *);
-#	endif
-#endif
-
-#define HAVE_RECVMSG 1
-
-#endif	/* UNIX */
 
 #if defined(HAVE_LONG_LONG) && defined(HAVE_OPEN64)
 #	define Open open64

Modified: trunk/rosapps/applications/net/roshttpd/common/list.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/net/roshttpd/…
==============================================================================
--- trunk/rosapps/applications/net/roshttpd/common/list.cpp	[iso-8859-1] (original)
+++ trunk/rosapps/applications/net/roshttpd/common/list.cpp	[iso-8859-1] Tue May 12
18:14:39 2015
@@ -34,7 +34,7 @@
 	Prev = prev;
 }
 
-void* CListNode::operator new(/*size_t*/ UINT size)
+void* CListNode::operator new(size_t size)
 {
     PVOID p;
     if (hHeap == NULL) {

Modified: trunk/rosapps/applications/net/roshttpd/include/list.h
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/net/roshttpd/…
==============================================================================
--- trunk/rosapps/applications/net/roshttpd/include/list.h	[iso-8859-1] (original)
+++ trunk/rosapps/applications/net/roshttpd/include/list.h	[iso-8859-1] Tue May 12
18:14:39 2015
@@ -14,7 +14,7 @@
 	CListNode();
 	CListNode(VOID *element, CListNode *next, CListNode *prev);
 	~CListNode() {};
-    void* operator new(/*size_t s*/ UINT s);
+    void* operator new(size_t s);
     VOID  operator delete(void* p);
 
 	VOID SetElement(PVOID element);

Modified: trunk/rosapps/applications/sysutils/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/CMak…
==============================================================================
--- trunk/rosapps/applications/sysutils/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/rosapps/applications/sysutils/CMakeLists.txt	[iso-8859-1] Tue May 12 18:14:39
2015
@@ -7,7 +7,9 @@
 add_subdirectory(lsdd)
 add_subdirectory(man)
 add_subdirectory(pedump)
-add_subdirectory(regexpl)
+if(ARCH STREQUAL "i386")
+    add_subdirectory(regexpl)
+endif()
 add_subdirectory(rosddt)
 add_subdirectory(screenshot)
 add_subdirectory(systeminfo)