[myserver-commit] [SCM] GNU MyServer branch, master, updated. 0_9_1-23-g0729c23

[Giuseppe Scrivano]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU MyServer".

The branch, master has been updated
       via  0729c236837deda9b59305ef9d7a731788e6926b (commit)
      from  9271f7e34f89746ca5b5b8bc896e2d957b8c8c16 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------


commit 0729c236837deda9b59305ef9d7a731788e6926b
Author: Giuseppe Scrivano <address@hidden>
Date:   Sat Feb 6 01:34:58 2010 +0100

    Include config.h in any case

diff --git a/myserver/bootstrap.conf b/myserver/bootstrap.conf
index 23e9241..f4aefb8 100644
--- a/myserver/bootstrap.conf
+++ b/myserver/bootstrap.conf
@@ -1,6 +1,6 @@
 # Bootstrap configuration.
 
-# Copyright (C) 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -36,6 +36,7 @@ getsockname
 gettext
 gettimeofday
 listen
+malloc
 mktime
 nproc
 pipe
diff --git a/myserver/myserver.h b/myserver/myserver.h
index 92b94e9..13e5af5 100644
--- a/myserver/myserver.h
+++ b/myserver/myserver.h
@@ -21,29 +21,13 @@
 
 extern "C"
 {
-#ifndef WIN32
-# include "config.h"
-#endif
-
-#ifdef HAVE_CONFIG_H
-# include <cstdlib>
-/*# include "time.h"*/
-# include <config.h>
-#endif
+#include "config.h"
 
 #ifdef HAVE_PTHREAD
 # include <pthread.h>
 #endif
 }
 
-#ifdef WIN32
-extern "C"
-{
-# include <tchar.h>
-# include <process.h>
-}
-#endif
-
 extern "C"
 {
 #include <stdlib.h>
@@ -54,7 +38,10 @@ extern "C"
 #include <ctype.h>
 #include <stdint.h>
 
-#ifndef WIN32
+#ifdef WIN32
+# include <tchar.h>
+# include <process.h>
+#else
 # include <sys/types.h>
 # include <sys/stat.h>
 # include <limits.h>

-----------------------------------------------------------------------

Summary of changes:
 myserver/bootstrap.conf |    3 ++-
 myserver/myserver.h     |   23 +++++------------------
 2 files changed, 7 insertions(+), 19 deletions(-)


hooks/post-receive
-- 
GNU MyServer