X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fbaconfig.h;h=b9c6cd9719aa991451e76117d4f956ca2cb13ca0;hb=704b9ff20b643de80ea4e87b593d5f548162ded5;hp=e003c9394ad3db4727b1eaaa3966fce9c42a82f6;hpb=13bba8315847b06f69a9e6f2768a5bfb0d5ebbb2;p=bacula%2Fbacula

diff --git a/bacula/src/baconfig.h b/bacula/src/baconfig.h
index e003c9394a..b9c6cd9719 100644
--- a/bacula/src/baconfig.h
+++ b/bacula/src/baconfig.h
@@ -30,6 +30,8 @@
 
 /* Bacula common configuration defines */
 
+#undef  TRUE
+#undef  FALSE
 #define TRUE  1
 #define FALSE 0
 
@@ -60,10 +62,13 @@
 #define _(s) gettext((s))
 #define N_(s) (s)
 #else
+#undef _
 #define _(s) (s)
+#undef N_
 #define N_(s) (s)
+#undef textdomain
 #define textdomain(d)
-#define bindtextdomain(p, d)
+/* #define bindtextdomain(p, d) */
 #endif
 
 
@@ -120,7 +125,6 @@
 #define STREAM_SHA1_SIGNATURE    10    /* SHA1 signature for the file */
 #define STREAM_WIN32_DATA        11    /* Win32 BackupRead data */
 #define STREAM_WIN32_GZIP_DATA   12    /* Gzipped Win32 BackupRead data */
-#define STREAM_WIN32_ATTRIBUTES  13    /* Unix attribs, but WIN32_DATA follows */
 
 /* 
  *  File type (Bacula defined).           
@@ -392,6 +396,10 @@ int  m_msg(char *file, int line, POOLMEM **msgbuf, char *fmt,...);
 #undef strdup
 #define strdup(buf) bad_call_on_strdup_use_bstrdup(buf)
 
+/* Use our fgets which handles interrupts */
+#undef fgets
+#define fgets(x,y,z) bfgets((x), (y), (z))
+
 #ifdef DEBUG
 #define bstrdup(str) strcpy((char *) b_malloc(__FILE__,__LINE__,strlen((str))+1),(str))
 #else
@@ -426,7 +434,7 @@ extern int thr_setconcurrency(int);
 
 #ifdef HAVE_DARWIN_OS
 /* Apparently someone forgot to wrap getdomainname as a C function */
-extern "C" int getdomainname(char *name, size_t len);
+extern "C" int getdomainname(char *name, int len);
 
 /* Darwin lib fnmatch() doesn't work, so use our own */
 #undef HAVE_FNMATCH