Final changes

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

diff --git a/bacula/src/console/console.c b/bacula/src/console/console.c
index 89c658e551f117cbccc2757d0f79a0234f804440..555e9332cd7aa4ce9c7ea8169d92119be1c378f2 100644 (file)
--- a/bacula/src/console/console.c
+++ b/bacula/src/console/console.c
@@ -380,8 +380,7 @@ Without that I don't how to speak to the Director :-(\n"), configfile);
 
    memset(&jcr, 0, sizeof(jcr));
 
-
-   WSA_Init();                       /* Initialize Windows sockets */
+   (void)WSA_Init();                       /* Initialize Windows sockets */
 
    if (ndir > 1) {
       struct sockaddr_in client_addr;
@@ -397,8 +396,8 @@ try_again:
       }
       UnlockRes();
       if (get_cmd(stdin, _("Select Director: "), UA_sock, 600) < 0) {
-         WSACleanup();               /* Cleanup Windows sockets */
-         return 1;
+        (void)WSACleanup();               /* Cleanup Windows sockets */
+        return 1;
       }
       item = atoi(UA_sock->msg);
       if (item < 0 || item > ndir) {
@@ -469,7 +468,6 @@ try_again:
 /* Cleanup and then exit */
 static void terminate_console(int sig)
 {
-   WSACleanup();               /* Cleanup Windows sockets */
 
    static bool already_here = false;
 
@@ -479,6 +477,7 @@ static void terminate_console(int sig)
    already_here = true;
    free_pool_memory(args);
    con_term();
+   (void)WSACleanup();              /* Cleanup Windows sockets */
    if (sig != 0) {
       exit(1);
    }

diff --git a/bacula/src/win32/README.win32 b/bacula/src/win32/README.win32
index c34805b2e30826ef02be44168070271ccfc0b143..23e2098b4b824fb29c500ce76ae19f34f0f3ad7e 100644 (file)
--- a/bacula/src/win32/README.win32
+++ b/bacula/src/win32/README.win32
@@ -53,13 +53,17 @@ The native Win32 interface code was written by:
 
 For more details of building wx, see depkgs-win32/wx/docs/msw/install.txt
 
+The easiest way to build this is to have a Visual Studio C++ 6.0. 
+However, you can use the free Microsoft C++ compiler with a bit
+of additional work.
+
 Here are additional pointers on building wx-console supplied by Nicolas Boichat:
 
 
 Tools I used (I think the 3 first one are included in VStudio) :
 - VC++ toolkit : http://msdn.microsoft.com/visualc/vctoolkit2003/
 - Windows Platform SDK :
-http://www.microsoft.com/msdownload/platformsdk/sdkupdate/
+   http://www.microsoft.com/msdownload/platformsdk/sdkupdate/
    (Core SDK and Internet Development SDK)
 - nmake (it got it with .Net Framework SDK)
 - lib.exe found in the SDK-base/Bin/win64 directory (works fine
@@ -74,13 +78,10 @@ Instructions if you want to build wx-console :
   + Follow the instructions in docs/msw/install.txt
      (Visual C++ 6.0 compilation - Using makefiles)
 
-- Add Platform SDK and wxWidgets dirs to VC++ vcvars.bat
-  Example :
-    Set PATH=F:\MSVC++\bin;F:\MSSDK\bin;%PATH%
-    Set
-INCLUDE=F:\MSVC++\include;F:\MSSDK\include;F:\wxWindows-2.4.2\include;F:
-\wxWindows-2.4.2\lib\msw;%INCLUDE%
-    Set LIB=F:\MSVC++\lib;F:\MSSDK\lib;F:\wxWindows-2.4.2\lib;%LIB%
+- Make sure that the environment variables are set as:
+  - PATH includes the directories bin of both the C++ Toolkit and the SDK
+  - INCLUDE includes the directories include of both the C++ Toolkit and the SDK
+  - LIB includes the directories Lib of both the C++ Toolkit and the SDK
     
 - Compile bacula depkg-win32 with Visual Studio or try the
   supplied makefiles as described in the doc.
@@ -88,3 +89,5 @@ INCLUDE=F:\MSVC++\include;F:\MSSDK\include;F:\wxWindows-2.4.2\include;F:
 - Compile wx-console with nmake -f wx-console.mak in
   src/win32/wx-console
 
+- Additional information on using the free Micrsosoft C++ see
+  http://sapdb.2scale.net/moin.cgi/MS_20C_2b_2b_20Toolkit