19July06

[bacula/bacula] / bacula / src / lib / bpipe.c

diff --git a/bacula/src/lib/bpipe.c b/bacula/src/lib/bpipe.c
index 630edcc2659ae39e643148f5e2d0af1ca505f226..12a5d8b925397c591c0a329e84314ff79d0165ee 100644 (file)
--- a/bacula/src/lib/bpipe.c
+++ b/bacula/src/lib/bpipe.c
@@ -25,17 +25,17 @@
 #include "jcr.h"
 
 int execvp_errors[] = {
-       EACCES,
-       ENOEXEC,
-       EFAULT,
-       EINTR,
-       E2BIG,
-       ENAMETOOLONG,
-       ENOMEM,
-#ifndef WIN32
-       ETXTBSY,
+        EACCES,
+        ENOEXEC,
+        EFAULT,
+        EINTR,
+        E2BIG,
+        ENAMETOOLONG,
+        ENOMEM,
+#ifndef HAVE_WIN32
+        ETXTBSY,
 #endif
-       ENOENT
+        ENOENT
 };
 int num_execvp_errors = (int)(sizeof(execvp_errors)/sizeof(int));
 
@@ -232,12 +232,12 @@ int close_bpipe(BPIPE *bpipe)
          }
          Dmsg1(800, "child status=%d\n", stat & ~b_errno_exit);
       } else if (WIFSIGNALED(chldstatus)) {  /* process died */
-#ifndef WIN32
+#ifndef HAVE_WIN32
          stat = WTERMSIG(chldstatus);
 #else
 #warning "WTERMSIG undefined in Win32 !!!"
 #endif
-         Dmsg1(800, "Child died from signale %d\n", stat);
+         Dmsg1(800, "Child died from signal %d\n", stat);
          stat |= b_errno_signal;      /* exit signal returned */
       }
    }