diff options
| author | WiSo <wiso@xbmc.org> | 2012-08-20 11:15:09 +0200 |
|---|---|---|
| committer | WiSo <wiso@xbmc.org> | 2012-08-20 11:17:51 +0200 |
| commit | a0e378f4984f76c422f2b84a5aeaffa242327b44 (patch) | |
| tree | 9008b9d1587e91eb7bab78b76a8f42a7740e65cb | |
| parent | 32f6deed674de37da32b8fa01095947bbe194f83 (diff) | |
[WIN32] fixed: event is a reserved keyword so change it to something else.
| -rw-r--r-- | xbmc/storage/windows/Win32StorageProvider.cpp | 6 | ||||
| -rw-r--r-- | xbmc/storage/windows/Win32StorageProvider.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/xbmc/storage/windows/Win32StorageProvider.cpp b/xbmc/storage/windows/Win32StorageProvider.cpp index a46e07c52e..af0c66882b 100644 --- a/xbmc/storage/windows/Win32StorageProvider.cpp +++ b/xbmc/storage/windows/Win32StorageProvider.cpp @@ -25,7 +25,7 @@ #include "storage/MediaManager.h" #include "utils/JobManager.h" -bool CWin32StorageProvider::event = false; +bool CWin32StorageProvider::xbevent = false; void CWin32StorageProvider::Initialize() { @@ -76,8 +76,8 @@ std::vector<CStdString> CWin32StorageProvider::GetDiskUsage() bool CWin32StorageProvider::PumpDriveChangeEvents(IStorageEventsCallback *callback) { - bool b = event; - event = false; + bool b = xbevent; + xbevent = false; return b; } diff --git a/xbmc/storage/windows/Win32StorageProvider.h b/xbmc/storage/windows/Win32StorageProvider.h index 088a060d99..9a60eec135 100644 --- a/xbmc/storage/windows/Win32StorageProvider.h +++ b/xbmc/storage/windows/Win32StorageProvider.h @@ -39,8 +39,8 @@ public: virtual bool PumpDriveChangeEvents(IStorageEventsCallback *callback); - static void SetEvent() { event = true; } - static bool event; + static void SetEvent() { xbevent = true; } + static bool xbevent; }; class CDetectDisc : public CJob |