Minor cleanup

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

diff --git a/bacula/src/lib/bnet.c b/bacula/src/lib/bnet.c
index 9d2b42911efdfb5bf884aa53360cd0b233820a3e..94c7285894ee3db1d10be5ba8eed0abc0559b5d1 100644 (file)
--- a/bacula/src/lib/bnet.c
+++ b/bacula/src/lib/bnet.c
@@ -272,7 +272,7 @@ int is_bnet_error(BSOCK *bsock)
  *  messages which are due to the other end shutting down too.
  */
 void
-bnet_suppress_error_messages(BSOCK *bsock, int flag)
+bnet_suppress_error_messages(BSOCK *bsock, bool flag)
 {      
    bsock->suppress_error_msgs = flag;
 }

diff --git a/bacula/src/lib/protos.h b/bacula/src/lib/protos.h
index 5d79868fc311b2dd7d6f25a9649a631e50a35abe..303011f6810f9ff113f5fa50d219b2b81858397f 100644 (file)
--- a/bacula/src/lib/protos.h
+++ b/bacula/src/lib/protos.h
@@ -84,7 +84,7 @@ int        bnet_wait_data_intr   (BSOCK *bsock, int sec);
 int        bnet_despool_to_bsock (BSOCK *bsock);
 int        is_bnet_stop          (BSOCK *bsock);
 int        is_bnet_error         (BSOCK *bsock);
-void       bnet_suppress_error_messages(BSOCK *bsock, int flag);
+void       bnet_suppress_error_messages(BSOCK *bsock, bool flag);
 
 /* bget_msg.c */
 int      bget_msg(BSOCK *sock);

diff --git a/bacula/src/win32/compat/compat.h b/bacula/src/win32/compat/compat.h
index 0e6c378dfe361edd8b5213803a73027316a0798d..5c7823e2a3d0a5f3f7c05148cc4ed81772b77199 100644 (file)
--- a/bacula/src/win32/compat/compat.h
+++ b/bacula/src/win32/compat/compat.h
@@ -187,10 +187,13 @@ struct stat
     uint64_t    st_blocks;
 };
 
+#undef  S_IFMT
 #define S_IFMT         0170000         /* file type mask */
+#undef  S_IFDIR
 #define S_IFDIR        0040000         /* directory */
 #define S_IFCHR        0020000         /* character special */
 #define S_IFIFO        0010000         /* pipe */
+#undef  S_IFREG
 #define S_IFREG        0100000         /* regular */
 #define S_IREAD        0000400         /* read permission, owner */
 #define S_IWRITE       0000200         /* write permission, owner */
@@ -222,6 +225,7 @@ struct stat
 #define S_ISBLK(x) 0
 #define S_ISFIFO(x) 0
 #endif //HAVE_MINGW
+
 #define S_ISSOCK(x) 0
 #define S_ISLNK(x)      0