From ce01154468acc27c22b785419252a87e2b6a2b55 Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Sun, 3 Dec 2006 16:55:06 +0000 Subject: [PATCH] kes Fix Win32 build, which broke when I added parse_args_only in lib. I'm not sure I got the entry point right for msvc. git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@3737 91ce42f0-d328-0410-95d8-f526ca767f89 --- bacula/src/win32/README.mingw32 | 10 ++++++++++ bacula/src/win32/dll/bacula.def | 1 + bacula/src/win32/libbac/msvc/bacula.def | 1 + bacula/technotes-1.39 | 2 ++ 4 files changed, 14 insertions(+) diff --git a/bacula/src/win32/README.mingw32 b/bacula/src/win32/README.mingw32 index 69e1e11508..92cb86ee77 100644 --- a/bacula/src/win32/README.mingw32 +++ b/bacula/src/win32/README.mingw32 @@ -135,6 +135,11 @@ C++ mangled name of the new function. strings .../bacula/src/win32/dll/.o | grep +Note, strings often will not show the desired symbol. In that case, +use: + + nm .../bacula/src/win32/dll/.o + Replace with the base part of the name of the source code file which contains the new function. Replace with the name of the new function. Remove the leading underscore and place the result @@ -164,6 +169,11 @@ C++ mangled name of the new function. strings .../bacula/src/win32/cats/cats_*/.o | grep +Note, strings often will not show the desired symbol. In that case, +use: + + nm .../bacula/src/win32/dll/.o + Replace with the base part of the name of the source code file which contains the new function. Replace with the name of the new function. Remove the leading underscore and place the result diff --git a/bacula/src/win32/dll/bacula.def b/bacula/src/win32/dll/bacula.def index 1ab520793d..c06ae29750 100644 --- a/bacula/src/win32/dll/bacula.def +++ b/bacula/src/win32/dll/bacula.def @@ -411,6 +411,7 @@ _Z8rwl_initP12s_rwlock_tag ; scan.c: _Z10parse_argsPcPS_PiS0_S0_i +_Z15parse_args_onlyPcPS_PiS0_S0_i _Z11skip_spacesPPc _Z14skip_nonspacesPPc _Z19strip_leading_spacePc diff --git a/bacula/src/win32/libbac/msvc/bacula.def b/bacula/src/win32/libbac/msvc/bacula.def index 71519ae20a..a6c15affdd 100644 --- a/bacula/src/win32/libbac/msvc/bacula.def +++ b/bacula/src/win32/libbac/msvc/bacula.def @@ -421,6 +421,7 @@ fnmatch ?fstrsch@@YAHPBD0@Z ?next_arg@@YAPADPAPAD@Z ?parse_args@@YAHPADPAPADPAH11H@Z +?parse_args_only@@YAHPADPAPADPAH11H@Z ?bsscanf@@YAHPBD0ZZ ; serial.obj diff --git a/bacula/technotes-1.39 b/bacula/technotes-1.39 index 731567919c..712f3d51c9 100644 --- a/bacula/technotes-1.39 +++ b/bacula/technotes-1.39 @@ -2,6 +2,8 @@ General: 03Dec06 +kes Fix Win32 build, which broke when I added parse_args_only in + lib. I'm not sure I got the entry point right for msvc. kes Turn off data encryption. It can be enabled by defining DATA_ENCRYPTION in src/version.h and recompiling. kes Implement flag to turn off data encryption feature. -- 2.39.5