Mailing List Archive

Updates:
Summary: win32 patches

Comment #1 on issue 323 by ste...@konink.de: win32 patches
http://code.google.com/p/cherokee/issues/detail?id=323

This is required to get it to compile:

Index: cherokee/main_worker.c
===================================================================
--- cherokee/main_worker.c (revision 2734)
+++ cherokee/main_worker.c (working copy)
@@ -34,6 +34,10 @@
#include "server-protected.h"
#include "util.h"

+#ifdef _WIN32
+# include "unix4win32.h"
+#endif
+
#ifdef HAVE_SYS_WAIT_H
# include <sys/wait.h>
#endif
@@ -110,6 +114,7 @@
}
}

+#ifndef _WIN32
static void
signals_handler (int sig, siginfo_t *si, void *context)
{
@@ -131,7 +136,7 @@
printf ("Server is exiting..\n");
cherokee_server_handle_TERM (srv);
break;
-
+
case SIGCHLD:
wait_process (si->si_pid);
break;
@@ -147,8 +152,8 @@
PRINT_ERROR ("Unknown signal: %d\n", sig);
}
}
+#endif

-
static ret_t
test_configuration_file (void)
{
@@ -167,6 +172,7 @@
common_server_initialization (cherokee_server_t *srv)
{
ret_t ret;
+#ifndef _WIN32
struct sigaction act;

/* Signals it handles
@@ -183,13 +189,14 @@

sigaction (SIGHUP, &act, NULL);
sigaction (SIGUSR2, &act, NULL);
+ sigaction (SIGCHLD, &act, NULL);
sigaction (SIGSEGV, &act, NULL);
sigaction (SIGTERM, &act, NULL);
sigaction (SIGINT, &act, NULL);
- sigaction (SIGCHLD, &act, NULL);
#ifdef SIGBUS
sigaction (SIGBUS, &act, NULL);
#endif
+#endif

if (document_root != NULL) {
cherokee_buffer_t tmp = CHEROKEE_BUF_INIT;
Index: cherokee/unix4win32.h
===================================================================
--- cherokee/unix4win32.h (revision 2734)
+++ cherokee/unix4win32.h (working copy)
@@ -181,6 +181,7 @@

/* Processes
*/
+#define statusp NULL
#define waitpid(pid,s,o) _cwait (statusp, pid, WAIT_CHILD)
#define WAIT_T int
#define WTERMSIG(x) ((x) & 0xff) /* or: SIGABRT ?? */
Index: cherokee/util.h
===================================================================
--- cherokee/util.h (revision 2734)
+++ cherokee/util.h (working copy)
@@ -147,10 +147,10 @@

/* IO vectors
*/
-ret_t cherokee_iovec_skip_sent (struct iovec orig[], uint16_t orig_len,
- struct iovec dest[], uint16_t *dest_len,
+ret_t cherokee_iovec_skip_sent (struct iovec *orig, uint16_t orig_len,
+ struct iovec *dest, uint16_t *dest_len,
size_t sent);
-ret_t cherokee_iovec_was_sent (struct iovec orig[], uint16_t orig_len,
size_t sent);
+ret_t cherokee_iovec_was_sent (struct iovec *orig, uint16_t orig_len,
size_t sent);

/* Debug
*/


--
You received this message because you are listed in the owner
or CC fields of this issue, or because you starred this issue.
You may adjust your issue notification preferences at:
http://code.google.com/hosting/settings
_______________________________________________
Cherokee-dev mailing list
Cherokee-dev@lists.octality.com
http://lists.octality.com/listinfo/cherokee-dev