[myserver-commit] [SCM] GNU MyServer branch, master, updated. 37ad0cbb51e0d90d450f421df5399e5a63dbe8e6

[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  37ad0cbb51e0d90d450f421df5399e5a63dbe8e6 (commit)
      from  ed81bdec890f814e98e734576d215247f29dc7f9 (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 37ad0cbb51e0d90d450f421df5399e5a63dbe8e6
Author: Giuseppe Scrivano <address@hidden>
Date:   Mon Oct 19 01:47:31 2009 +0200

    Use directly `num_processors' offered by gnulib.

diff --git a/myserver/include/base/utility.h b/myserver/include/base/utility.h
index d8ddc8b..7ee8d9d 100644
--- a/myserver/include/base/utility.h
+++ b/myserver/include/base/utility.h
@@ -36,7 +36,6 @@ using namespace std;
 int preparePrintError ();
 int endPrintError ();
 
-u_long getCPUCount ();
 u_long getTicks ();
 int setcwdBuffer ();
 int getdefaultwdlen ();
diff --git a/myserver/src/Makefile.am b/myserver/src/Makefile.am
index c293f30..c2ba815 100644
--- a/myserver/src/Makefile.am
+++ b/myserver/src/Makefile.am
@@ -8,7 +8,7 @@ myserver_CXXFLAGS = $(CXXFLAGS) $(XML_CFLAGS) 
-DHOST_STR=\"$(build)\" -DPREFIX=\
 myserver_LDFLAGS =  -rdynamic
 myserver_LDADD = libmyserver.a $(PTHREAD_LIB) $(IDN_LIB) \
        $(XNET_LIB) $(EVENT_LIB) $(DL_LIB) $(SSL_LIB) $(ZLIB_LIB) \
-       $(XML_LIBS)  ../lib/libgnu.a $(LDFLAGS)
+       $(XML_LIBS)  $(LDFLAGS) ../lib/libgnu.a
 
 clean-libmyserver.a:
        rm -f libmyserver.a
diff --git a/myserver/src/base/utility.cpp b/myserver/src/base/utility.cpp
index f2cd26e..80b93f6 100644
--- a/myserver/src/base/utility.cpp
+++ b/myserver/src/base/utility.cpp
@@ -25,7 +25,6 @@ extern "C"
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
-#include "nproc.h"
 #ifndef WIN32
 # include <unistd.h>
 # include <signal.h>
@@ -53,14 +52,6 @@ using namespace std;
 static char *currentPath = 0;
 
 /*!
- * Returns the number of processors available on the local machine.
- */
-u_long getCPUCount ()
-{
-  return num_processors ();
-}
-
-/*!
  * Save the current working directory.
  * Return -1 on fails.
  * Return 0 on success.
diff --git a/myserver/src/server/Makefile.am b/myserver/src/server/Makefile.am
index d74c9c6..2c54c69 100644
--- a/myserver/src/server/Makefile.am
+++ b/myserver/src/server/Makefile.am
@@ -1,7 +1,7 @@
 lib_LIBRARIES = libserver.a
 libserver_a_SOURCES = clients_thread.cpp server.cpp
 SUBDIRS =
-AM_CPPFLAGS = $(all_includes)
+AM_CPPFLAGS = $(all_includes) -I$(top_builddir)/lib -I$(top_srcdir)/lib
 
 install:
 # Do not do anything.
diff --git a/myserver/src/server/server.cpp b/myserver/src/server/server.cpp
index bd52744..89c3d4a 100644
--- a/myserver/src/server/server.cpp
+++ b/myserver/src/server/server.cpp
@@ -30,7 +30,6 @@ along with this program.  If not, see 
<http://www.gnu.org/licenses/>.
 #include <include/base/file/files_utility.h>
 #include <include/base/ssl/ssl.h>
 #include <include/base/socket/ssl_socket.h>
-
 #include <include/conf/main/xml_main_configuration.h>
 
 #include <cstdarg>
@@ -38,6 +37,8 @@ along with this program.  If not, see 
<http://www.gnu.org/licenses/>.
 
 extern "C"
 {
+#include "nproc.h"
+
 #ifdef WIN32
 # include <direct.h>
 #else
@@ -272,7 +273,7 @@ int Server::postLoad ()
   mimeManager.registerHandler (xml, &xmlMimeHandler);
   mimeManager.setDefaultHandler (xml);
 
-  log (MYSERVER_LOG_MSG_INFO, _("Detected %i CPUs"), (int) getCPUCount ());
+  log (MYSERVER_LOG_MSG_INFO, _("Detected %i CPUs"), (int) num_processors ());
 
   connectionsScheduler.restart ();
 

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

Summary of changes:
 myserver/include/base/utility.h |    1 -
 myserver/src/Makefile.am        |    2 +-
 myserver/src/base/utility.cpp   |    9 ---------
 myserver/src/server/Makefile.am |    2 +-
 myserver/src/server/server.cpp  |    5 +++--
 5 files changed, 5 insertions(+), 14 deletions(-)


hooks/post-receive
-- 
GNU MyServer