Tweak Win32 build

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

diff --git a/bacula/src/bc_types.h b/bacula/src/bc_types.h
index 632acd00e3676616359440c6096189b60752b8b2..75950bd32ded714331572a9c6ffc83eb34275855 100644 (file)
--- a/bacula/src/bc_types.h
+++ b/bacula/src/bc_types.h
@@ -15,22 +15,17 @@
 
  */
 /*
-   Copyright (C) 2000-2005 Kern Sibbald
+   Copyright (C) 2000-2006 Kern Sibbald
 
    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 the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
+   modify it under the terms of the GNU General Public License
+   version 2 as amended with additional clauses defined in the
+   file LICENSE in the main source directory.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public
-   License along with this program; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-   MA 02111-1307, USA.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 
+   the file LICENSE for additional details.
 
  */
 

diff --git a/bacula/src/lib/lib.h b/bacula/src/lib/lib.h
index 88c2fe4d16f1f7cb2784b897e5ab44c2e28ca3df..244bdc576fcbadb6ba4cb97f38b0bcec49c3a543 100644 (file)
--- a/bacula/src/lib/lib.h
+++ b/bacula/src/lib/lib.h
@@ -9,7 +9,7 @@
  */
 
 /*
-   Copyright (C) 2000-2005 Kern Sibbald
+   Copyright (C) 2000-2006 Kern Sibbald
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License

diff --git a/bacula/src/lib/protos.h b/bacula/src/lib/protos.h
index 4d088abe2d7e2f3148c2d2ebc881c8fefb6dae8c..ede58ef2343be3da04447d52610b6418225edc8a 100644 (file)
--- a/bacula/src/lib/protos.h
+++ b/bacula/src/lib/protos.h
@@ -76,9 +76,11 @@ BSOCK *    bnet_connect          (JCR *jcr, int retry_interval,
 void       bnet_close            (BSOCK *bsock);
 BSOCK *    init_bsock            (JCR *jcr, int sockfd, const char *who, const char *ip,
                                   int port, struct sockaddr *client_addr);
-#ifdef HAVE_WIN32
+#ifdef WIN32
+#ifndef socklen_t
 #define socklen_t int
 #endif
+#endif
 int        bnet_get_peer           (BSOCK *bs, char *buf, socklen_t buflen);
 BSOCK *    dup_bsock             (BSOCK *bsock);
 void       term_bsock            (BSOCK *bsock);