summaryrefslogtreecommitdiff
path: root/plugin
diff options
context:
space:
mode:
authorVladislav Vaintroub <wlad@montyprogram.com>2011-11-29 02:00:24 +0100
committerVladislav Vaintroub <wlad@montyprogram.com>2011-11-29 02:00:24 +0100
commit82adfe7b2a695fd9357e1f2f04415fd1691956b8 (patch)
tree2e40b547655593fd7d5fd74b0f610cbf168a6763 /plugin
parente79847d16a0f51137ca46f23af7d5276dce7952d (diff)
downloadmariadb-git-82adfe7b2a695fd9357e1f2f04415fd1691956b8.tar.gz
merge, fix Windows warnings
Diffstat (limited to 'plugin')
-rw-r--r--plugin/feedback/feedback.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/plugin/feedback/feedback.h b/plugin/feedback/feedback.h
index 60ef72eed84..df9020fc37e 100644
--- a/plugin/feedback/feedback.h
+++ b/plugin/feedback/feedback.h
@@ -12,8 +12,9 @@
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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
-
+#ifndef MYSQL_SERVER
#define MYSQL_SERVER
+#endif
#include <mysql_priv.h>
namespace feedback {