X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fbaconfig.h;h=4c7ae5ef3105c46fc1708965b4aac4ff8386411e;hb=8fe276359efe90c40a83f85ff8476d17f10da740;hp=c6c6854e771e54cbba4744777482a5e995399e14;hpb=49839d5884780b05d5323732715f3f28d4b77171;p=bacula%2Fbacula diff --git a/bacula/src/baconfig.h b/bacula/src/baconfig.h index c6c6854e77..4c7ae5ef31 100644 --- a/bacula/src/baconfig.h +++ b/bacula/src/baconfig.h @@ -5,19 +5,32 @@ * Version $Id$ */ /* - 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 - 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 - the file LICENSE for additional details. - - */ + Bacula® - The Network Backup Solution + + Copyright (C) 2000-2006 Free Software Foundation Europe e.V. + + The main author of Bacula is Kern Sibbald, with contributions from + many others, a complete list can be found in the file AUTHORS. + This program is Free Software; you can redistribute it and/or + modify it under the terms of version two of the GNU General Public + License as published by the Free Software Foundation plus additions + that are listed in the file LICENSE. + + 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., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301, USA. + + Bacula® is a registered trademark of John Walker. + The licensor of Bacula is the Free Software Foundation Europe + (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich, + Switzerland, email:ftf@fsfeurope.org. +*/ #ifndef _BACONFIG_H @@ -70,15 +83,36 @@ void InitWinAPIWrapper(); #define OSDependentInit() InitWinAPIWrapper() -#undef ENABLE_NLS + +#if defined(BUILDING_DLL) +# define DLL_IMP_EXP _declspec(dllexport) +#elif defined(USING_DLL) +# define DLL_IMP_EXP _declspec(dllimport) +#else # define DLL_IMP_EXP +#endif + +#if defined(USING_CATS) +# define CATS_IMP_EXP _declspec(dllimport) +#else +# define CATS_IMP_EXP +#endif + #else #define DLL_IMP_EXP +#define CATS_IMP_EXP #define OSDependentInit() +#define tape_open open +#define tape_ioctl ioctl +#define tape_read read +#define tape_write write +#define tape_close ::close + #endif + #ifdef ENABLE_NLS #include #include @@ -89,6 +123,12 @@ void InitWinAPIWrapper(); #define N_(s) (s) #endif /* N_ */ #else /* !ENABLE_NLS */ + #undef _ + #undef N_ + #undef textdomain + #undef bindtextdomain + #undef setlocale + #ifndef _ #define _(s) (s) #endif @@ -105,6 +145,8 @@ void InitWinAPIWrapper(); #define setlocale(p, d) #endif #endif /* ENABLE_NLS */ + + /* Use the following for strings not to be translated */ #define NT_(s) (s) @@ -243,6 +285,9 @@ void InitWinAPIWrapper(); /* Size of File Address stored in STREAM_SPARSE_DATA. Do NOT change! */ #define SPARSE_FADDR_SIZE (sizeof(uint64_t)) +/* Size of crypto length stored at head of crypto buffer. Do NOT change! */ +#define CRYPTO_LEN_SIZE ((int)sizeof(uint32_t)) + /* This is for dumb compilers/libraries like Solaris. Linux GCC * does it correctly, so it might be worthwhile @@ -303,7 +348,13 @@ typedef int (INTHANDLER)(); #define MODE_RW 0666 #endif -#ifdef DEBUG_MUTEX +#if defined(HAVE_WIN32) +typedef int64_t boffset_t; +#else +typedef off_t boffset_t; +#endif + +#if defined(DEBUG_MUTEX) extern void _p(char *file, int line, pthread_mutex_t *m); extern void _v(char *file, int line, pthread_mutex_t *m); @@ -489,6 +540,14 @@ int m_msg(const char *file, int line, POOLMEM *&pool_buf, const char *fmt, ...) #ifndef HAVE_WXCONSOLE #undef strdup #define strdup(buf) bad_call_on_strdup_use_bstrdup(buf) +#else +/* Groan, WxWidgets has its own way of doing NLS so cleanup */ +#ifndef ENABLE_NLS +#undef _ +#undef setlocale +#undef textdomain +#undef bindtextdomain +#endif #endif /* Use our fgets which handles interrupts */ @@ -517,7 +576,7 @@ int m_msg(const char *file, int line, POOLMEM *&pool_buf, const char *fmt, ...) #define REPLACE_NEVER 'n' #define REPLACE_IFOLDER 'o' -/* This probably should be done on a machine by machine basic, but it works */ +/* This probably should be done on a machine by machine basis, but it works */ /* This is critical for the smartalloc routines to properly align memory */ #define ALIGN_SIZE (sizeof(double)) #define BALIGN(x) (((x) + ALIGN_SIZE - 1) & ~(ALIGN_SIZE -1)) @@ -574,15 +633,25 @@ extern "C" int mknod ( const char *path, int mode, dev_t device ); #endif +#if defined(HAVE_WIN32) +#define DEFAULT_CONFIGDIR "C:\\Documents and Settings\\All Users\\Application Data\\Bacula" + +inline bool IsPathSeparator(int ch) { return ch == '/' || ch == '\\'; } +inline char *first_path_separator(char *path) { return strpbrk(path, "/\\"); } +inline const char *first_path_separator(const char *path) { return strpbrk(path, "/\\"); } + +#else /* Define Winsock functions if we aren't on Windows */ -#if !defined HAVE_WIN32 + #define WSA_Init() 0 /* 0 = success */ #define WSACleanup() 0 /* 0 = success */ -#endif -#ifdef HAVE_AIX_OS +inline bool IsPathSeparator(int ch) { return ch == '/'; } +inline char *first_path_separator(char *path) { return strchr(path, '/'); } +inline const char *first_path_separator(const char *path) { return strchr(path, '/'); } #endif + /* HP-UX 11 specific workarounds */ #ifdef HAVE_HPUX_OS @@ -595,7 +664,6 @@ extern int h_errno; */ extern "C" int getdomainname(char *name, int namelen); extern "C" int setdomainname(char *name, int namelen); -#define uLong unsigned long #endif /* HAVE_HPUX_OS */ @@ -606,12 +674,6 @@ extern "C" long gethostid(void); #endif -/* Added by KES to deal with Win32 systems */ -#ifndef S_ISWIN32 -#define S_ISWIN32 020000 -#endif - - /* Disabled because it breaks internationalisation... #undef HAVE_SETLOCALE #ifdef HAVE_SETLOCALE