From 57fb25eec87ce9882014b3f0a2f69966bfd5af54 Mon Sep 17 00:00:00 2001 From: Neil Date: Wed, 14 Jun 2017 08:52:47 +1000 Subject: Backport: Use same #if guard as other files. Backport of changeset 6314:29c42c61f7c4. --- qt/ScintillaEditBase/ScintillaEditBase.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/qt/ScintillaEditBase/ScintillaEditBase.h b/qt/ScintillaEditBase/ScintillaEditBase.h index 7692cf2b7..b1151c55d 100644 --- a/qt/ScintillaEditBase/ScintillaEditBase.h +++ b/qt/ScintillaEditBase/ScintillaEditBase.h @@ -27,6 +27,7 @@ class ScintillaQt; class SurfaceImpl; struct SCNotification; +#ifndef EXPORT_IMPORT_API #ifdef WIN32 #ifdef MAKING_LIBRARY #define EXPORT_IMPORT_API __declspec(dllexport) @@ -38,6 +39,7 @@ struct SCNotification; #else #define EXPORT_IMPORT_API #endif +#endif class EXPORT_IMPORT_API ScintillaEditBase : public QAbstractScrollArea { Q_OBJECT -- cgit v1.2.3