remove googlecode from the namespace

git-svn-id: http://libproxy.googlecode.com/svn/trunk@518 c587cffe-e639-0410-9787-d7902ae8ed56

1 files changed, 5 insertions, 12 deletions

diff --git a/libproxy/url.cpp b/libproxy/url.cpp
index cab5142..6ba57cf 100644
--- a/libproxy/url.cpp
+++ b/libproxy/url.cpp
@@ -29,9 +29,7 @@
 #include <cstdlib>    // For atoi()
 #include <sys/stat.h> // For stat()
 
-#include "url.hpp"
-
-#ifdef _WIN32
+#ifdef WIN32
 #include <io.h>
 #define pfsize(st) (st.st_size)
 #define close _close
@@ -40,6 +38,10 @@
 #define pfsize(st) (st.st_blksize * st.st_blocks)
 #endif
 
+#include "url.hpp"
+using namespace libproxy;
+using namespace std;
+
 // This mime type should be reported by the web server
 #define PAC_MIME_TYPE "application/x-ns-proxy-autoconfig"
 // Fall back to checking for this mime type, which servers often report wrong
@@ -48,11 +50,6 @@
 // This is the maximum pac size (to avoid memory attacks)
 #define PAC_MAX_SIZE 102400
 
-namespace com {
-namespace googlecode {
-namespace libproxy {
-using namespace std;
-
 static inline int _get_default_port(string scheme) {
         struct servent *serv;
         if ((serv = getservbyname(scheme.c_str(), NULL))) return ntohs(serv->s_port);
@@ -417,7 +414,3 @@ char* url::get_pac() {
 	close(sock);
 	return buffer;
 }
-
-}
-}
-}