Undo __SVR4 changes

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@368 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/src/baconfig.h b/bacula/src/baconfig.h
index f160f06a0bb3656afa7fdfd1eb9c3bebbcbce26d..993b40fa3b08459467f62ac5081373bd16e390c0 100644 (file)
--- a/bacula/src/baconfig.h
+++ b/bacula/src/baconfig.h
@@ -414,9 +414,4 @@ extern "C" int getdomainname(char *name, size_t len);
 #define REPLACE_NEVER    'n'
 #define REPLACE_IFOLDER  'o'
 
-#ifdef __SVR4
-#undef socklen_t
-#define socklen_t int
-#endif
-
 #endif /* _BACONFIG_H */

diff --git a/bacula/src/lib/bnet_server.c b/bacula/src/lib/bnet_server.c
index 9706bd218e69140cd68cb40f2b5cc488ebfff4dc..a789fa8d566481d809c43f7e596d42da4827fdb0 100644 (file)
--- a/bacula/src/lib/bnet_server.c
+++ b/bacula/src/lib/bnet_server.c
@@ -55,11 +55,7 @@ bnet_thread_server(char *bind_addr, int port, int max_clients, workq_t *client_w
    struct in_addr bind_ip;           /* address to bind to */
    int tlog;
    fd_set ready, sockset;
-#ifdef __SVR4
-   char turnon = 1;
-#else
    int turnon = 1;
-#endif
    char *caller;
 #ifdef HAVE_LIBWRAP
    struct request_info request;
@@ -188,11 +184,7 @@ bnet_bind(int port)
    int sockfd;
    struct sockaddr_in serv_addr;      /* our address */
    int tlog;
-#ifdef __SVR4
-   char turnon = 1;
-#else
    int turnon = 1;
-#endif
 
    /*
     * Open a TCP socket  
@@ -243,11 +235,7 @@ bnet_accept(BSOCK *bsock, char *who)
    struct sockaddr_in cli_addr;       /* client's address */
    char *caller, *buf;
    BSOCK *bs;
-#ifdef __SVR4
-   char turnon = 1;
-#else
    int turnon = 1;
-#endif
 #ifdef HAVE_LIBWRAP
    struct request_info request;
 #endif