wrowe 02/02/12 13:59:01
Modified: threadproc/win32 signals.c
passwd apr_getpass.c
time/win32 time.c
Log:
More safe header exclusions from Mladen Turk <[EMAIL PROTECTED]>
for the WinCE port.
Revision Changes Path
1.18 +2 -0 apr/threadproc/win32/signals.c
Index: signals.c
===================================================================
RCS file: /home/cvs/apr/threadproc/win32/signals.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- signals.c 20 Sep 2001 20:25:11 -0000 1.17
+++ signals.c 12 Feb 2002 21:59:01 -0000 1.18
@@ -57,7 +57,9 @@
#include "apr_thread_proc.h"
#include "apr_file_io.h"
#include "apr_general.h"
+#if APR_HAVE_SIGNAL_H
#include <signal.h>
+#endif
#include <string.h>
#if APR_HAVE_SYS_WAIT
#include <sys/wait.h>
1.19 +12 -0 apr/passwd/apr_getpass.c
Index: apr_getpass.c
===================================================================
RCS file: /home/cvs/apr/passwd/apr_getpass.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- apr_getpass.c 10 Jun 2001 17:48:46 -0000 1.18
+++ apr_getpass.c 12 Feb 2002 21:59:01 -0000 1.19
@@ -61,8 +61,12 @@
#include "apr_strings.h"
#include "apr_lib.h"
#include "apr_errno.h"
+#if APR_HAVE_SYS_TYPES_H
#include <sys/types.h>
+#endif
+#if APR_HAVE_ERRNO_H
#include <errno.h>
+#endif
#if APR_HAVE_UNISTD_H
#include <unistd.h>
@@ -165,6 +169,13 @@
static char *getpass(const char *prompt)
{
+/* WCE lacks console. So the getpass is unsuported
+ * The only way is to use the GUI so the getpass should be implemented
+ * on per-application basis.
+*/
+#ifdef _WIN32_WCE
+ return NULL;
+#else
static char password[MAX_STRING_LEN];
int n = 0;
@@ -190,6 +201,7 @@
}
return (char *) &password;
+#endif
}
#endif /* no getchar or _getch */
1.26 +4 -0 apr/time/win32/time.c
Index: time.c
===================================================================
RCS file: /home/cvs/apr/time/win32/time.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- time.c 12 Feb 2002 01:18:13 -0000 1.25
+++ time.c 12 Feb 2002 21:59:01 -0000 1.26
@@ -57,8 +57,12 @@
#include "apr_general.h"
#include "apr_lib.h"
#include "apr_portable.h"
+#if APR_HAVE_TIME_H
#include <time.h>
+#endif
+#if APR_HAVE_ERRNO_H
#include <errno.h>
+#endif
#include <string.h>
#include <winbase.h>
