From: Nicolas Boichat <nicolas@boichat.ch>
Date: Sun, 24 Apr 2005 22:12:49 +0000 (+0000)
Subject: Fixes to make wx-console compatible with wxWidgets 2.6.0.
X-Git-Tag: Release-7.0.0~8870
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=be5d6337246390e4e213a2241af91dd8481d9004;p=bacula%2Fbacula

Fixes to make wx-console compatible with wxWidgets 2.6.0.


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

diff --git a/bacula/src/baconfig.h b/bacula/src/baconfig.h
index d6e675bc90..5cda012fd1 100644
--- a/bacula/src/baconfig.h
+++ b/bacula/src/baconfig.h
@@ -442,8 +442,10 @@ int  m_msg(const char *file, int line, POOLMEM *&pool_buf, const char *fmt, ...)
 
 
 /* Use our strdup with smartalloc */
+#ifndef __WXGTK__
 #undef strdup
 #define strdup(buf) bad_call_on_strdup_use_bstrdup(buf)
+#endif
 
 /* Use our fgets which handles interrupts */
 #undef fgets