[myserver-commit] [SCM] GNU MyServer branch, master, updated. 0_9_2-102-gc0ea46a

[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  c0ea46ae4789aa18dbe377489d5a5134f62f1cc3 (commit)
      from  5d2014f9c5d0957a46845214153e860bffd70c63 (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 c0ea46ae4789aa18dbe377489d5a5134f62f1cc3
Author: Giuseppe Scrivano <address@hidden>
Date:   Wed Apr 7 16:00:56 2010 +0200

    Remove extern "C" when it is not needed.
    
    Mass update using the sed script:
      '1h;1!H;${;g;s/extern "C"[ \n]\?{\n\([^}]*\)}/\1/g;p}'

diff --git a/myserver/include/base/crypt/sha1.h 
b/myserver/include/base/crypt/sha1.h
index ff65ee5..7bcc3b0 100644
--- a/myserver/include/base/crypt/sha1.h
+++ b/myserver/include/base/crypt/sha1.h
@@ -21,10 +21,8 @@
 #ifndef SHA1_CRYPT_H
 # define SHA1_CRYPT_H
 
-extern "C"
-{
 # include <sha1.h>
-}
+
 
 # include "myserver.h"
 
diff --git a/myserver/include/base/dynamic_lib/dynamiclib.h 
b/myserver/include/base/dynamic_lib/dynamiclib.h
index 973b949..44d998e 100644
--- a/myserver/include/base/dynamic_lib/dynamiclib.h
+++ b/myserver/include/base/dynamic_lib/dynamiclib.h
@@ -22,15 +22,13 @@
 
 # include <string>
 
-extern "C"
-{
 # ifdef WIN32
 #  include <direct.h>
 # endif
 # ifdef HAVE_DL
 #  include <dlfcn.h>
 # endif
-}
+
 
 using namespace std;
 
diff --git a/myserver/include/base/read_directory/read_directory.h 
b/myserver/include/base/read_directory/read_directory.h
index 9bdc7ef..de3c43d 100644
--- a/myserver/include/base/read_directory/read_directory.h
+++ b/myserver/include/base/read_directory/read_directory.h
@@ -21,8 +21,6 @@
 
 # include "myserver.h"
 
-extern "C"
-{
 # ifdef WIN32
 #  include <io.h>
 # endif
@@ -35,7 +33,7 @@ extern "C"
 #  include <dirent.h>
 # endif
 # include <limits.h>
-}
+
 
 # include <string>
 # include <include/base/sync/mutex.h>
diff --git a/myserver/include/base/regex/myserver_regex.h 
b/myserver/include/base/regex/myserver_regex.h
index 484a56b..45f49b9 100644
--- a/myserver/include/base/regex/myserver_regex.h
+++ b/myserver/include/base/regex/myserver_regex.h
@@ -22,11 +22,9 @@
 
 # include "myserver.h"
 
-extern "C"
-{
 # include <stdio.h>
 # include "regex.h"
-}
+
 
 # include <string>
 using namespace std;
diff --git a/myserver/include/base/socket/socket.h 
b/myserver/include/base/socket/socket.h
index 0146039..b601c7b 100644
--- a/myserver/include/base/socket/socket.h
+++ b/myserver/include/base/socket/socket.h
@@ -24,12 +24,10 @@
 
 # include "myserver.h"
 
-extern "C"
-{
 # include <sys/types.h>
 # include <sys/select.h>
 # include <sys/socket.h>
-}
+
 
 # include <include/filter/stream.h>
 
@@ -37,14 +35,12 @@ extern "C"
 using namespace std;
 
 # ifndef WIN32
-extern "C"
-{
 #  include <sys/ioctl.h>
 #  include <netinet/in.h>
 #  include <netdb.h>
 #  include <stdio.h>
 #  include <unistd.h>
-}
+
 # endif
 
 typedef int SocketHandle;
diff --git a/myserver/include/base/socket/ssl_socket.h 
b/myserver/include/base/socket/ssl_socket.h
index ff947de..898b1d5 100644
--- a/myserver/include/base/socket/ssl_socket.h
+++ b/myserver/include/base/socket/ssl_socket.h
@@ -22,11 +22,9 @@
 
 # include "myserver.h"
 
-extern "C"
-{
 # include <sys/types.h>
 # include <sys/socket.h>
-}
+
 
 # include <include/base/socket/socket.h>
 # include <include/base/ssl/ssl.h>
diff --git a/myserver/include/base/xml/xml_parser.h 
b/myserver/include/base/xml/xml_parser.h
index 17f6b11..0a04ff0 100644
--- a/myserver/include/base/xml/xml_parser.h
+++ b/myserver/include/base/xml/xml_parser.h
@@ -23,14 +23,12 @@
 # include "myserver.h"
 # include <include/base/file/file.h>
 # include <include/base/mem_buff/mem_buff.h>
-extern "C"
-{
 # include <libxml/xmlmemory.h>
 # include <libxml/parser.h>
 # include <libxml/tree.h>
 # include <libxml/xpath.h>
 # include <libxml/xpathInternals.h>
-}
+
 # include <string>
 
 using namespace std;
diff --git a/myserver/include/conf/mime/mime_manager.h 
b/myserver/include/conf/mime/mime_manager.h
index def7f41..72fa38d 100644
--- a/myserver/include/conf/mime/mime_manager.h
+++ b/myserver/include/conf/mime/mime_manager.h
@@ -33,8 +33,6 @@
 #  include <windows.h>
 # endif
 
-extern "C"
-{
 # include <stdio.h>
 # include <stdlib.h>
 # include <string.h>
@@ -44,7 +42,7 @@ extern "C"
 #  include <tchar.h>
 #  include <io.h>
 # endif
-}
+
 
 # include <string>
 # include <map>
diff --git a/myserver/include/conf/mime/xml_mime_handler.h 
b/myserver/include/conf/mime/xml_mime_handler.h
index caff7aa..3bc24b1 100644
--- a/myserver/include/conf/mime/xml_mime_handler.h
+++ b/myserver/include/conf/mime/xml_mime_handler.h
@@ -33,8 +33,6 @@
 #  include <windows.h>
 # endif
 
-extern "C"
-{
 # include <stdio.h>
 # include <stdlib.h>
 # include <string.h>
@@ -44,7 +42,7 @@ extern "C"
 #  include <tchar.h>
 #  include <io.h>
 # endif
-}
+
 
 # include <string>
 # include <map>
diff --git a/myserver/include/connection/connection.h 
b/myserver/include/connection/connection.h
index 2dee1c2..c18eb09 100644
--- a/myserver/include/connection/connection.h
+++ b/myserver/include/connection/connection.h
@@ -22,10 +22,8 @@
 
 # include "myserver.h"
 
-extern "C"
-{
 # include <sys/time.h>
-}
+
 
 # include <include/base/socket/socket.h>
 # include <include/protocol/protocol_buffer.h>
diff --git a/myserver/include/protocol/http/http_headers.h 
b/myserver/include/protocol/http/http_headers.h
index e4a3456..7684d19 100644
--- a/myserver/include/protocol/http/http_headers.h
+++ b/myserver/include/protocol/http/http_headers.h
@@ -23,8 +23,6 @@
 # include "myserver.h"
 # include <include/connection/connection.h>
 
-extern "C"
-{
 # ifdef WIN32
 #  include <direct.h>
 #  include <errno.h>
@@ -32,7 +30,7 @@ extern "C"
 #  include <string.h>
 #  include <errno.h>
 # endif
-}
+
 
 # include <string>
 using namespace std;
diff --git a/myserver/include/protocol/http/http_thread_context.h 
b/myserver/include/protocol/http/http_thread_context.h
index 0f5b9b8..5c2a85d 100644
--- a/myserver/include/protocol/http/http_thread_context.h
+++ b/myserver/include/protocol/http/http_thread_context.h
@@ -30,8 +30,6 @@
 # include <include/conf/mime/mime_manager.h>
 # include <include/conf/security/security_token.h>
 
-extern "C"
-{
 # ifdef WIN32
 #  include <direct.h>
 #  include <errno.h>
@@ -39,7 +37,7 @@ extern "C"
 #  include <string.h>
 #  include <errno.h>
 # endif
-}
+
 # include <string>
 using namespace std;
 
diff --git a/myserver/myserver.h b/myserver/myserver.h
index ede34f1..23dd447 100644
--- a/myserver/myserver.h
+++ b/myserver/myserver.h
@@ -19,17 +19,13 @@
 #ifndef STDAFX_H
 # define STDAFX_H
 
-extern "C"
-{
 # include "config.h"
 
 # ifdef HAVE_PTHREAD
 #  include <pthread.h>
 # endif
-}
 
-extern "C"
-{
+
 # include <stdlib.h>
 # include <stdio.h>
 # include <fcntl.h>
@@ -46,18 +42,16 @@ extern "C"
 #  include <sys/stat.h>
 #  include <limits.h>
 # endif
-}
+
 
 typedef void* HANDLE;
 
 #endif
 
-extern "C"
-{
 #ifdef HAVE_GETTEXT
 # include <libintl.h>
 # define _(X) gettext (X)
 #else
 # define _(X) X
 #endif
-}
+
diff --git a/myserver/src/base/base64/mime_utils.cpp 
b/myserver/src/base/base64/mime_utils.cpp
index 92701f4..bc095a3 100644
--- a/myserver/src/base/base64/mime_utils.cpp
+++ b/myserver/src/base/base64/mime_utils.cpp
@@ -19,15 +19,13 @@ along with this program.  If not, see 
<http://www.gnu.org/licenses/>.
 #include "myserver.h"
 #include <include/base/base64/mime_utils.h>
 
-extern "C"
-{
 #ifndef WIN32
 # include <ctype.h>
 #endif
 
 #include <stdio.h>
 #include <stdlib.h>
-}
+
 
 #include <string.h>
 
diff --git a/myserver/src/base/file/file.cpp b/myserver/src/base/file/file.cpp
index 93fb3cf..c5382db 100644
--- a/myserver/src/base/file/file.cpp
+++ b/myserver/src/base/file/file.cpp
@@ -22,8 +22,6 @@ along with this program.  If not, see 
<http://www.gnu.org/licenses/>.
 #include <include/base/string/stringutils.h>
 #include <include/base/file/files_utility.h>
 
-extern "C"
-{
 #include <fcntl.h>
 #include <unistd.h>
 #include <sys/types.h>
@@ -45,7 +43,7 @@ extern "C"
 # include <sys/types.h>
 # include <unistd.h>
 #endif
-}
+
 
 #include <string>
 #include <sstream>
diff --git a/myserver/src/base/file/files_utility.cpp 
b/myserver/src/base/file/files_utility.cpp
index 75b2cfc..d6a1384 100644
--- a/myserver/src/base/file/files_utility.cpp
+++ b/myserver/src/base/file/files_utility.cpp
@@ -22,14 +22,10 @@ along with this program.  If not, see 
<http://www.gnu.org/licenses/>.
 #include <include/base/utility.h>
 #include <include/base/string/stringutils.h>
 
-extern "C"
-{
 #include <sys/stat.h>
-}
+
 
 #ifndef WIN32
-extern "C"
-{
 # include <fcntl.h>
 # include <unistd.h>
 # include <sys/types.h>
@@ -40,7 +36,7 @@ extern "C"
 # include <string.h>
 # include <math.h>
 # include <time.h>
-}
+
 #endif
 
 #include <string>
diff --git a/myserver/src/base/files_cache/cached_file.cpp 
b/myserver/src/base/files_cache/cached_file.cpp
index cdf4c83..fa24bfa 100644
--- a/myserver/src/base/files_cache/cached_file.cpp
+++ b/myserver/src/base/files_cache/cached_file.cpp
@@ -23,8 +23,6 @@
 #include <include/base/files_cache/cached_file.h>
 
 #ifndef WIN32
-extern "C"
-{
 # include <fcntl.h>
 # include <unistd.h>
 # include <sys/types.h>
@@ -36,7 +34,7 @@ extern "C"
 # include <string.h>
 # include <math.h>
 # include <time.h>
-}
+
 #endif
 
 #include <string>
diff --git a/myserver/src/base/files_cache/cached_file_buffer.cpp 
b/myserver/src/base/files_cache/cached_file_buffer.cpp
index 912ad4a..1e61b52 100644
--- a/myserver/src/base/files_cache/cached_file_buffer.cpp
+++ b/myserver/src/base/files_cache/cached_file_buffer.cpp
@@ -26,8 +26,6 @@ along with this program.  If not, see 
<http://www.gnu.org/licenses/>.
 #include <include/base/files_cache/cached_file_factory.h>
 
 #ifndef WIN32
-extern "C"
-{
 # include <fcntl.h>
 # include <unistd.h>
 # include <sys/types.h>
@@ -39,7 +37,7 @@ extern "C"
 # include <string.h>
 # include <math.h>
 # include <time.h>
-}
+
 #endif
 
 #include <string>
diff --git a/myserver/src/base/files_cache/cached_file_factory.cpp 
b/myserver/src/base/files_cache/cached_file_factory.cpp
index ece0aa2..4f408b0 100644
--- a/myserver/src/base/files_cache/cached_file_factory.cpp
+++ b/myserver/src/base/files_cache/cached_file_factory.cpp
@@ -24,8 +24,6 @@ along with this program.  If not, see 
<http://www.gnu.org/licenses/>.
 #include <include/base/files_cache/cached_file_factory.h>
 
 #ifndef WIN32
-extern "C"
-{
 # include <fcntl.h>
 # include <unistd.h>
 # include <sys/types.h>
@@ -37,7 +35,7 @@ extern "C"
 # include <string.h>
 # include <math.h>
 # include <time.h>
-}
+
 #endif
 
 /*!
diff --git a/myserver/src/base/files_cache/membuf_file.cpp 
b/myserver/src/base/files_cache/membuf_file.cpp
index dd2dd68..e88823b 100644
--- a/myserver/src/base/files_cache/membuf_file.cpp
+++ b/myserver/src/base/files_cache/membuf_file.cpp
@@ -23,8 +23,6 @@
 #include <include/base/files_cache/membuf_file.h>
 
 #ifndef WIN32
-extern "C"
-{
 # include <fcntl.h>
 # include <unistd.h>
 # include <sys/types.h>
@@ -36,7 +34,7 @@ extern "C"
 # include <string.h>
 # include <math.h>
 # include <time.h>
-}
+
 #endif
 
 #include <string>
diff --git a/myserver/src/base/home_dir/home_dir.cpp 
b/myserver/src/base/home_dir/home_dir.cpp
index b360b58..4699c00 100644
--- a/myserver/src/base/home_dir/home_dir.cpp
+++ b/myserver/src/base/home_dir/home_dir.cpp
@@ -27,8 +27,6 @@ along with this program.  If not, see 
<http://www.gnu.org/licenses/>.
 # include <userenv.h>
 #endif
 
-extern "C"
-{
 #include <string.h>
 #include <stdlib.h>
 #include <stdarg.h>
@@ -49,7 +47,7 @@ extern "C"
 
 # include <sys/wait.h>
 #endif
-}
+
 
 #ifdef WIN32
 # include <direct.h>
diff --git a/myserver/src/base/pipe/pipe.cpp b/myserver/src/base/pipe/pipe.cpp
index 62256e5..733e764 100644
--- a/myserver/src/base/pipe/pipe.cpp
+++ b/myserver/src/base/pipe/pipe.cpp
@@ -22,8 +22,6 @@
 #include <include/base/pipe/pipe.h>
 
 #ifndef WIN32
-extern "C"
-{
 # include <fcntl.h>
 # include <unistd.h>
 # include <sys/types.h>
@@ -35,7 +33,7 @@ extern "C"
 # include <string.h>
 # include <math.h>
 # include <time.h>
-}
+
 #else
 # include <windows.h>
 #endif
diff --git a/myserver/src/base/process/fork_server.cpp 
b/myserver/src/base/process/fork_server.cpp
index d3bd03a..f3f25cf 100644
--- a/myserver/src/base/process/fork_server.cpp
+++ b/myserver/src/base/process/fork_server.cpp
@@ -22,11 +22,9 @@
 #include <include/base/utility.h>
 
 #ifndef WIN32
-extern "C"
-{
 # include <unistd.h>
 # include <sys/wait.h>
-}
+
 #endif
 /*!
  *Write a string to the socket.
diff --git a/myserver/src/base/process/process.cpp 
b/myserver/src/base/process/process.cpp
index 0f8c542..2f08615 100644
--- a/myserver/src/base/process/process.cpp
+++ b/myserver/src/base/process/process.cpp
@@ -20,8 +20,6 @@ along with this program.  If not, see 
<http://www.gnu.org/licenses/>.
 #include "myserver.h"
 #include <include/base/utility.h>
 
-extern "C"
-{
 #include <errno.h>
 #include <string.h>
 #include <stdlib.h>
@@ -42,7 +40,7 @@ extern "C"
 # endif
 
 #endif
-}
+
 
 #ifndef UID_T_MAX
 # define UID_T_MAX (1<<31)
diff --git a/myserver/src/base/read_directory/read_directory.cpp 
b/myserver/src/base/read_directory/read_directory.cpp
index 40d9e03..8e02794 100644
--- a/myserver/src/base/read_directory/read_directory.cpp
+++ b/myserver/src/base/read_directory/read_directory.cpp
@@ -20,8 +20,6 @@
 
 #include <include/base/read_directory/read_directory.h>
 
-extern "C"
-{
 #include <stdio.h>
 #include <string.h>
 #include <errno.h>
@@ -29,7 +27,7 @@ extern "C"
 #ifdef HAVE_OPENAT
 # include <fcntl.h>
 #endif
-}
+
 
 using namespace std;
 
diff --git a/myserver/src/base/safetime/safetime.cpp 
b/myserver/src/base/safetime/safetime.cpp
index 1d4754d..3bb1eeb 100644
--- a/myserver/src/base/safetime/safetime.cpp
+++ b/myserver/src/base/safetime/safetime.cpp
@@ -20,14 +20,13 @@ along with this program.  If not, see 
<http://www.gnu.org/licenses/>.
 #include <include/base/safetime/safetime.h>
 #include <include/base/sync/mutex.h>
 
-extern "C" {
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
 #ifndef WIN32
 # include <stdio.h>
 #endif
-}
+
 
 #ifndef WIN32
 # if !HAVE_LOCALTIME_R
diff --git a/myserver/src/base/socket/socket.cpp 
b/myserver/src/base/socket/socket.cpp
index 0f1409d..f2bab81 100644
--- a/myserver/src/base/socket/socket.cpp
+++ b/myserver/src/base/socket/socket.cpp
@@ -22,8 +22,6 @@ along with this program.  If not, see 
<http://www.gnu.org/licenses/>.
 #include <include/base/socket/socket.h>
 #include <include/base/utility.h>
 
-extern "C"
-{
 #include <sys/ioctl.h>
 #include <errno.h>
 
@@ -33,7 +31,7 @@ extern "C"
 # include <netinet/in.h>
 # include <arpa/inet.h>
 #endif
-}
+
 
 #include <sstream>
 
diff --git a/myserver/src/base/socket/ssl_socket.cpp 
b/myserver/src/base/socket/ssl_socket.cpp
index d6e25e8..9804890 100644
--- a/myserver/src/base/socket/ssl_socket.cpp
+++ b/myserver/src/base/socket/ssl_socket.cpp
@@ -21,8 +21,6 @@
 #include <include/base/utility.h>
 #include "include/base/socket/ssl_socket.h"
 
-extern "C"
-{
 #include <string.h>
 #include <stdio.h>
 #include <sys/types.h>
@@ -36,7 +34,7 @@ extern "C"
 # include <netinet/in.h>
 # include <arpa/inet.h>
 #endif
-}
+
 
 #include <sstream>
 
diff --git a/myserver/src/base/socket_pair/socket_pair.cpp 
b/myserver/src/base/socket_pair/socket_pair.cpp
index d2d3dbb..e3bcf2f 100644
--- a/myserver/src/base/socket_pair/socket_pair.cpp
+++ b/myserver/src/base/socket_pair/socket_pair.cpp
@@ -21,8 +21,6 @@ along with this program.  If not, see 
<http://www.gnu.org/licenses/>.
 #include <include/base/socket_pair/socket_pair.h>
 
 #ifndef WIN32
-extern "C"
-{
 # include <fcntl.h>
 # include <unistd.h>
 # include <sys/types.h>
@@ -37,7 +35,7 @@ extern "C"
 
 # include <sys/socket.h>
 # include <sys/uio.h>
-}
+
 #else
 # include <windows.h>
 #endif
diff --git a/myserver/src/base/ssl/ssl.cpp b/myserver/src/base/ssl/ssl.cpp
index f3b7c43..f249b22 100644
--- a/myserver/src/base/ssl/ssl.cpp
+++ b/myserver/src/base/ssl/ssl.cpp
@@ -23,8 +23,6 @@
 
 #include <string.h>
 
-extern "C"
-{
 #if HAVE_PTHREAD
 # include <pthread.h>
 #endif
@@ -43,7 +41,7 @@ GCRY_THREAD_OPTION_PTHREAD_IMPL;
 # undef malloc
 # endif
 #endif
-}
+
 
 SslContext::SslContext ()
 {
diff --git a/myserver/src/base/string/stringutils.cpp 
b/myserver/src/base/string/stringutils.cpp
index c5c3061..5a76950 100644
--- a/myserver/src/base/string/stringutils.cpp
+++ b/myserver/src/base/string/stringutils.cpp
@@ -20,15 +20,13 @@
 #include <include/base/string/stringutils.h>
 #include <include/base/safetime/safetime.h>
 
-extern "C"
-{
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
 #ifndef WIN32
 # include <stdio.h>
 #endif
-}
+
 
 #ifdef GETTIMEOFDAY
 # include <sys/time.h>
diff --git a/myserver/src/base/sync/event.cpp b/myserver/src/base/sync/event.cpp
index 1db107d..20583aa 100644
--- a/myserver/src/base/sync/event.cpp
+++ b/myserver/src/base/sync/event.cpp
@@ -20,7 +20,6 @@ along with this program.  If not, see 
<http://www.gnu.org/licenses/>.
 #include "myserver.h"
 #include <include/base/sync/event.h>
 
-extern "C" {
 #include <string.h>
 #include <stdlib.h>
 #include <stdarg.h>
@@ -37,7 +36,7 @@ extern "C" {
 # endif
 # include <sys/wait.h>
 #endif
-}
+
 
 #include <sys/types.h>
 
diff --git a/myserver/src/base/sync/mutex.cpp b/myserver/src/base/sync/mutex.cpp
index bc59835..f86fe18 100644
--- a/myserver/src/base/sync/mutex.cpp
+++ b/myserver/src/base/sync/mutex.cpp
@@ -21,7 +21,6 @@ along with this program.  If not, see 
<http://www.gnu.org/licenses/>.
 #include <include/base/utility.h>
 #include <include/base/sync/mutex.h>
 
-extern "C" {
 #include <string.h>
 #include <stdlib.h>
 #include <stdarg.h>
@@ -36,7 +35,7 @@ extern "C" {
 # endif
 # include <sys/wait.h>
 #endif
-}
+
 
 #include <sys/types.h>
 
diff --git a/myserver/src/base/sync/recursive_mutex.cpp 
b/myserver/src/base/sync/recursive_mutex.cpp
index c035ca8..8834dac 100644
--- a/myserver/src/base/sync/recursive_mutex.cpp
+++ b/myserver/src/base/sync/recursive_mutex.cpp
@@ -20,7 +20,6 @@ along with this program.  If not, see 
<http://www.gnu.org/licenses/>.
 #include "myserver.h"
 #include <include/base/sync/recursive_mutex.h>
 
-extern "C" {
 #include <string.h>
 #include <stdlib.h>
 #include <stdarg.h>
@@ -35,7 +34,7 @@ extern "C" {
 # endif
 # include <sys/wait.h>
 #endif
-}
+
 
 #include <sys/types.h>
 
diff --git a/myserver/src/base/sync/semaphore.cpp 
b/myserver/src/base/sync/semaphore.cpp
index f37ef3c..6219549 100644
--- a/myserver/src/base/sync/semaphore.cpp
+++ b/myserver/src/base/sync/semaphore.cpp
@@ -21,7 +21,6 @@ along with this program.  If not, see 
<http://www.gnu.org/licenses/>.
 #include <include/base/utility.h>
 #include <include/base/sync/semaphore.h>
 
-extern "C" {
 #include <string.h>
 #include <stdlib.h>
 #include <stdarg.h>
@@ -38,7 +37,7 @@ extern "C" {
 # endif
 # include <sys/wait.h>
 #endif
-}
+
 
 #include <sys/types.h>
 
diff --git a/myserver/src/base/thread/thread.cpp 
b/myserver/src/base/thread/thread.cpp
index f77e38e..7820cee 100644
--- a/myserver/src/base/thread/thread.cpp
+++ b/myserver/src/base/thread/thread.cpp
@@ -21,8 +21,6 @@ along with this program.  If not, see 
<http://www.gnu.org/licenses/>.
 #include <include/base/utility.h>
 #include <include/base/thread/thread.h>
 
-extern "C"
-{
 #include <string.h>
 #include <stdlib.h>
 #include <stdarg.h>
@@ -37,7 +35,7 @@ extern "C"
 # endif
 # include <sys/wait.h>
 #endif
-}
+
 
 #include <sys/types.h>
 
diff --git a/myserver/src/base/utility.cpp b/myserver/src/base/utility.cpp
index cca09f1..06ea7ff 100644
--- a/myserver/src/base/utility.cpp
+++ b/myserver/src/base/utility.cpp
@@ -23,6 +23,7 @@ along with this program.  If not, see 
<http://www.gnu.org/licenses/>.
 extern "C"
 {
 #include <chdir-long.h>
+}
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -39,7 +40,7 @@ extern "C"
 #  include <error.h>
 # endif
 #endif
-}
+
 
 #ifdef WIN32
 # include <direct.h>
diff --git a/myserver/src/base/xml/xml_parser.cpp 
b/myserver/src/base/xml/xml_parser.cpp
index efbe0f6..13b0b8f 100644
--- a/myserver/src/base/xml/xml_parser.cpp
+++ b/myserver/src/base/xml/xml_parser.cpp
@@ -22,10 +22,8 @@
 #include <include/base/utility.h>
 #include <include/base/file/files_utility.h>
 
-extern "C"
-{
 #include <string.h>
-}
+
 
 /**
  * Internal call back functions for saveMemBuf
diff --git a/myserver/src/connections_scheduler/connections_scheduler.cpp 
b/myserver/src/connections_scheduler/connections_scheduler.cpp
index d124807..0d34e49 100644
--- a/myserver/src/connections_scheduler/connections_scheduler.cpp
+++ b/myserver/src/connections_scheduler/connections_scheduler.cpp
@@ -20,10 +20,8 @@
 #undef remove
 
 #ifdef WIN32
-extern "C"
-{
 # include <w32sock.h>
-}
+
 #endif
 
 #include <include/connections_scheduler/connections_scheduler.h>
diff --git a/myserver/src/connections_scheduler/listen_threads.cpp 
b/myserver/src/connections_scheduler/listen_threads.cpp
index 0185ba6..4f94a4b 100644
--- a/myserver/src/connections_scheduler/listen_threads.cpp
+++ b/myserver/src/connections_scheduler/listen_threads.cpp
@@ -23,8 +23,6 @@
 #include <include/base/sync/semaphore.h>
 #include <include/base/sync/event.h>
 
-extern "C"
-{
 #ifdef WIN32
 # include <direct.h>
 #endif
@@ -40,7 +38,7 @@ extern "C"
 #  include <pthread.h>
 # endif
 #endif
-}
+
 
 #include <set>
 #include <algorithm>
diff --git a/myserver/src/filter/gzip/gzip.cpp 
b/myserver/src/filter/gzip/gzip.cpp
index 50b6d21..8f8fdc5 100644
--- a/myserver/src/filter/gzip/gzip.cpp
+++ b/myserver/src/filter/gzip/gzip.cpp
@@ -21,8 +21,6 @@
 #include <include/filter/gzip/gzip.h>
 #include <include/base/string/securestr.h>
 
-extern "C"
-{
 #ifdef WIN32
 # include <direct.h>
 # include <errno.h>
@@ -31,7 +29,7 @@ extern "C"
 # include <string.h>
 # include <errno.h>
 #endif
-}
+
 
 #ifdef WIN32
 # include <algorithm>
diff --git a/myserver/src/filter/gzip/gzip_decompress.cpp 
b/myserver/src/filter/gzip/gzip_decompress.cpp
index 80d6c3e..4cb69c8 100644
--- a/myserver/src/filter/gzip/gzip_decompress.cpp
+++ b/myserver/src/filter/gzip/gzip_decompress.cpp
@@ -20,8 +20,6 @@
 #include <include/filter/gzip/gzip_decompress.h>
 #include <include/base/string/securestr.h>
 
-extern "C"
-{
 #ifdef WIN32
 # include <direct.h>
 # include <errno.h>
@@ -29,7 +27,7 @@ extern "C"
 # include <string.h>
 # include <errno.h>
 #endif
-}
+
 #ifdef WIN32
 # include <algorithm>
 #endif
diff --git a/myserver/src/http_handler/cgi/cgi.cpp 
b/myserver/src/http_handler/cgi/cgi.cpp
index 1b887d4..45bce5a 100644
--- a/myserver/src/http_handler/cgi/cgi.cpp
+++ b/myserver/src/http_handler/cgi/cgi.cpp
@@ -36,13 +36,11 @@ along with this program.  If not, see 
<http://www.gnu.org/licenses/>.
 #include <string>
 #include <sstream>
 
-extern "C"
-{
 #ifdef WIN32
 # include <direct.h>
 #endif
 #include <string.h>
-}
+
 
 using namespace std;
 
diff --git a/myserver/src/http_handler/http_dir/http_dir.cpp 
b/myserver/src/http_handler/http_dir/http_dir.cpp
index 7742053..89b0060 100644
--- a/myserver/src/http_handler/http_dir/http_dir.cpp
+++ b/myserver/src/http_handler/http_dir/http_dir.cpp
@@ -24,8 +24,6 @@ along with this program.  If not, see 
<http://www.gnu.org/licenses/>.
 #include <include/filter/filters_chain.h>
 #include <include/base/file/files_utility.h>
 
-extern "C"
-{
 #include <errno.h>
 
 #ifdef WIN32
@@ -33,7 +31,7 @@ extern "C"
 #else
 # include <string.h>
 #endif
-}
+
 
 #include <include/base/read_directory/read_directory.h>
 #include <include/base/string/stringutils.h>
diff --git a/myserver/src/http_handler/http_file/http_file.cpp 
b/myserver/src/http_handler/http_file/http_file.cpp
index 5936067..6600076 100644
--- a/myserver/src/http_handler/http_file/http_file.cpp
+++ b/myserver/src/http_handler/http_file/http_file.cpp
@@ -28,8 +28,6 @@
 #include <algorithm>
 using namespace std;
 
-extern "C"
-{
 #ifdef WIN32
 # include <direct.h>
 # include <errno.h>
@@ -37,7 +35,7 @@ extern "C"
 # include <string.h>
 # include <errno.h>
 #endif
-}
+
 
 /*!
   Main function to handle the HTTP PUT command.
diff --git a/myserver/src/http_handler/wincgi/wincgi.cpp 
b/myserver/src/http_handler/wincgi/wincgi.cpp
index 6f41ebb..05154d0 100644
--- a/myserver/src/http_handler/wincgi/wincgi.cpp
+++ b/myserver/src/http_handler/wincgi/wincgi.cpp
@@ -29,14 +29,12 @@
 #include <include/filter/filters_chain.h>
 #include <include/base/safetime/safetime.h>
 
-extern "C"
-{
 #ifdef WIN32
 # include <direct.h>
 #endif
 
 #include <string.h>
-}
+
 
 #include <string>
 #include <sstream>
diff --git a/myserver/src/myserver.cpp b/myserver/src/myserver.cpp
index ea51af4..59f4874 100644
--- a/myserver/src/myserver.cpp
+++ b/myserver/src/myserver.cpp
@@ -23,8 +23,6 @@
 #include <include/base/process/process.h>
 #include <include/conf/main/xml_main_configuration.h>
 
-extern "C"
-{
 #ifdef WIN32
 # include <direct.h>
 #endif
@@ -36,7 +34,7 @@ extern "C"
 # include <unistd.h>
 # include <signal.h>
 #endif
-}
+
 
 #ifdef HAVE_GETTEXT
 # include "localedir.h"
diff --git a/myserver/src/plugin/plugins_manager.cpp 
b/myserver/src/plugin/plugins_manager.cpp
index 935b560..9b2cf35 100644
--- a/myserver/src/plugin/plugins_manager.cpp
+++ b/myserver/src/plugin/plugins_manager.cpp
@@ -25,14 +25,12 @@ along with this program.  If not, see 
<http://www.gnu.org/licenses/>.
 #include <string>
 #include <memory>
 
-extern "C"
-{
 #include <libxml/xmlmemory.h>
 #include <libxml/parser.h>
 #include <libxml/tree.h>
 #include <libxml/xpath.h>
 #include <libxml/xpathInternals.h>
-}
+
 
 using namespace std;
 
diff --git a/myserver/src/protocol/control/control_header.cpp 
b/myserver/src/protocol/control/control_header.cpp
index 883cb5a..9c873b7 100644
--- a/myserver/src/protocol/control/control_header.cpp
+++ b/myserver/src/protocol/control/control_header.cpp
@@ -23,8 +23,6 @@
 #include <include/protocol/control/control_header.h>
 #include <include/base/xml/xml_parser.h>
 #include <include/protocol/control/control_errors.h>
-extern "C"
-{
 #ifdef WIN32
 # include <direct.h>
 # include <errno.h>
@@ -33,7 +31,7 @@ extern "C"
 # include <string.h>
 # include <errno.h>
 #endif
-}
+
 
 /*!
  *Return a string containing options specified by the client.
diff --git a/myserver/src/protocol/control/control_protocol.cpp 
b/myserver/src/protocol/control/control_protocol.cpp
index 5be58f9..a6cc066 100644
--- a/myserver/src/protocol/control/control_protocol.cpp
+++ b/myserver/src/protocol/control/control_protocol.cpp
@@ -30,8 +30,6 @@
 #include <include/base/file/files_utility.h>
 #include <string.h>
 
-extern "C"
-{
 #include <stdio.h>
 
 #ifdef WIN32
@@ -41,7 +39,7 @@ extern "C"
 # include <string.h>
 # include <errno.h>
 #endif
-}
+
 #include <string>
 #include <sstream>
 
diff --git a/myserver/src/protocol/http/env/env.cpp 
b/myserver/src/protocol/http/env/env.cpp
index b506d35..fa088fd 100644
--- a/myserver/src/protocol/http/env/env.cpp
+++ b/myserver/src/protocol/http/env/env.cpp
@@ -27,13 +27,11 @@ along with this program.  If not, see 
<http://www.gnu.org/licenses/>.
 #include <sstream>
 #include <algorithm>
 
-extern "C"
-{
 #ifdef WIN32
 # include <direct.h>
 #endif
 #include <string.h>
-}
+
 
 using namespace std;
 
diff --git a/myserver/src/protocol/http/http.cpp 
b/myserver/src/protocol/http/http.cpp
index 51f3af0..61450f7 100644
--- a/myserver/src/protocol/http/http.cpp
+++ b/myserver/src/protocol/http/http.cpp
@@ -51,8 +51,6 @@
 
 using namespace std;
 
-extern "C"
-{
 #ifdef WIN32
 # include <direct.h>
 # include <errno.h>
@@ -62,7 +60,7 @@ extern "C"
 # include <string.h>
 # include <errno.h>
 #endif
-}
+
 
 int HttpProtocol::loadProtocol ()
 {
diff --git a/myserver/src/protocol/http/http_headers.cpp 
b/myserver/src/protocol/http/http_headers.cpp
index 05bce44..1bb07e2 100644
--- a/myserver/src/protocol/http/http_headers.cpp
+++ b/myserver/src/protocol/http/http_headers.cpp
@@ -28,8 +28,6 @@ along with this program.  If not, see 
<http://www.gnu.org/licenses/>.
 #include <include/protocol/http/http_errors.h>
 #include <include/conf/vhost/vhost.h>
 
-extern "C"
-{
 #ifdef WIN32
 # include <direct.h>
 # include <errno.h>
@@ -37,7 +35,7 @@ extern "C"
 # include <string.h>
 # include <errno.h>
 #endif
-}
+
 
 /*!
  * Builds an HTTP header string starting from an HttpResponseHeader structure.
diff --git a/myserver/src/protocol/https/https.cpp 
b/myserver/src/protocol/https/https.cpp
index e60ae67..0dee320 100644
--- a/myserver/src/protocol/https/https.cpp
+++ b/myserver/src/protocol/https/https.cpp
@@ -21,8 +21,6 @@
 #include <include/protocol/protocol.h>
 #include <include/protocol/https/https.h>
 
-extern "C"
-{
 #ifdef WIN32
 # include <direct.h>
 # include <errno.h>
@@ -31,7 +29,7 @@ extern "C"
 # include <string.h>
 # include <errno.h>
 #endif
-}
+
 
 /*!
   Returns the name of the protocol. If an out buffer is defined
diff --git a/myserver/src/server/clients_thread.cpp 
b/myserver/src/server/clients_thread.cpp
index 903dfe6..da1aebc 100644
--- a/myserver/src/server/clients_thread.cpp
+++ b/myserver/src/server/clients_thread.cpp
@@ -31,8 +31,6 @@ along with this program.  If not, see 
<http://www.gnu.org/licenses/>.
 #include <include/protocol/ftp/ftp.h>
 
 #ifndef WIN32
-extern "C"
-{
 # include <sys/socket.h>
 # include <netinet/in.h>
 # include <arpa/inet.h>
@@ -45,7 +43,7 @@ extern "C"
 # endif
 # include <sys/types.h>
 # include <sys/wait.h>
-}
+
 #endif
 
 /*!
diff --git a/myserver/src/server/server.cpp b/myserver/src/server/server.cpp
index ac522a7..528bf0f 100644
--- a/myserver/src/server/server.cpp
+++ b/myserver/src/server/server.cpp
@@ -41,8 +41,6 @@
 #include <cstdarg>
 
 
-extern "C"
-{
 #ifdef WIN32
 # include <direct.h>
 #else
@@ -59,7 +57,7 @@ extern "C"
 # endif
 
 #endif
-}
+
 #include <sstream>
 
 Server* Server::instance = NULL;
diff --git a/myserver/tests/test_socket.cpp b/myserver/tests/test_socket.cpp
index 385984c..5b6f18e 100644
--- a/myserver/tests/test_socket.cpp
+++ b/myserver/tests/test_socket.cpp
@@ -26,14 +26,12 @@
 #include "../include/base/thread/thread.h"
 #include "../include/base/utility.h"
 
-extern "C"
-{
 #include <string.h>
 #ifndef WIN32
 # include <errno.h>
 # include <arpa/inet.h>
 #endif
-}
+
 #include <iostream>
 
 using namespace std;
diff --git a/myserver/tests/test_ssl_socket.cpp 
b/myserver/tests/test_ssl_socket.cpp
index a65d618..f54d831 100644
--- a/myserver/tests/test_ssl_socket.cpp
+++ b/myserver/tests/test_ssl_socket.cpp
@@ -32,14 +32,12 @@
 #include <include/base/thread/thread.h>
 #include <include/base/utility.h>
 
-extern "C"
-{
 #include <string.h>
 #ifndef WIN32
 # include <errno.h>
 # include <arpa/inet.h>
 #endif
-}
+
 
 #include <string>
 #include <iostream>

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

Summary of changes:
 myserver/include/base/crypt/sha1.h                 |    4 +---
 myserver/include/base/dynamic_lib/dynamiclib.h     |    4 +---
 .../include/base/read_directory/read_directory.h   |    4 +---
 myserver/include/base/regex/myserver_regex.h       |    4 +---
 myserver/include/base/socket/socket.h              |    8 ++------
 myserver/include/base/socket/ssl_socket.h          |    4 +---
 myserver/include/base/xml/xml_parser.h             |    4 +---
 myserver/include/conf/mime/mime_manager.h          |    4 +---
 myserver/include/conf/mime/xml_mime_handler.h      |    4 +---
 myserver/include/connection/connection.h           |    4 +---
 myserver/include/protocol/http/http_headers.h      |    4 +---
 .../include/protocol/http/http_thread_context.h    |    4 +---
 myserver/myserver.h                                |   12 +++---------
 myserver/src/base/base64/mime_utils.cpp            |    4 +---
 myserver/src/base/file/file.cpp                    |    4 +---
 myserver/src/base/file/files_utility.cpp           |    8 ++------
 myserver/src/base/files_cache/cached_file.cpp      |    4 +---
 .../src/base/files_cache/cached_file_buffer.cpp    |    4 +---
 .../src/base/files_cache/cached_file_factory.cpp   |    4 +---
 myserver/src/base/files_cache/membuf_file.cpp      |    4 +---
 myserver/src/base/home_dir/home_dir.cpp            |    4 +---
 myserver/src/base/pipe/pipe.cpp                    |    4 +---
 myserver/src/base/process/fork_server.cpp          |    4 +---
 myserver/src/base/process/process.cpp              |    4 +---
 .../src/base/read_directory/read_directory.cpp     |    4 +---
 myserver/src/base/safetime/safetime.cpp            |    3 +--
 myserver/src/base/socket/socket.cpp                |    4 +---
 myserver/src/base/socket/ssl_socket.cpp            |    4 +---
 myserver/src/base/socket_pair/socket_pair.cpp      |    4 +---
 myserver/src/base/ssl/ssl.cpp                      |    4 +---
 myserver/src/base/string/stringutils.cpp           |    4 +---
 myserver/src/base/sync/event.cpp                   |    3 +--
 myserver/src/base/sync/mutex.cpp                   |    3 +--
 myserver/src/base/sync/recursive_mutex.cpp         |    3 +--
 myserver/src/base/sync/semaphore.cpp               |    3 +--
 myserver/src/base/thread/thread.cpp                |    4 +---
 myserver/src/base/utility.cpp                      |    3 ++-
 myserver/src/base/xml/xml_parser.cpp               |    4 +---
 .../connections_scheduler.cpp                      |    4 +---
 .../src/connections_scheduler/listen_threads.cpp   |    4 +---
 myserver/src/filter/gzip/gzip.cpp                  |    4 +---
 myserver/src/filter/gzip/gzip_decompress.cpp       |    4 +---
 myserver/src/http_handler/cgi/cgi.cpp              |    4 +---
 myserver/src/http_handler/http_dir/http_dir.cpp    |    4 +---
 myserver/src/http_handler/http_file/http_file.cpp  |    4 +---
 myserver/src/http_handler/wincgi/wincgi.cpp        |    4 +---
 myserver/src/myserver.cpp                          |    4 +---
 myserver/src/plugin/plugins_manager.cpp            |    4 +---
 myserver/src/protocol/control/control_header.cpp   |    4 +---
 myserver/src/protocol/control/control_protocol.cpp |    4 +---
 myserver/src/protocol/http/env/env.cpp             |    4 +---
 myserver/src/protocol/http/http.cpp                |    4 +---
 myserver/src/protocol/http/http_headers.cpp        |    4 +---
 myserver/src/protocol/https/https.cpp              |    4 +---
 myserver/src/server/clients_thread.cpp             |    4 +---
 myserver/src/server/server.cpp                     |    4 +---
 myserver/tests/test_socket.cpp                     |    4 +---
 myserver/tests/test_ssl_socket.cpp                 |    4 +---
 58 files changed, 63 insertions(+), 179 deletions(-)


hooks/post-receive
-- 
GNU MyServer