diff options
| author | Paul Gilbert | 2009-07-26 00:27:32 +0000 |
|---|---|---|
| committer | Paul Gilbert | 2009-07-26 00:27:32 +0000 |
| commit | 8e60e31db36b18fae9f95eb82db7bf1ad58fa668 (patch) | |
| tree | 1eacd943e443cc7c59d95d27f1da309f2676b122 | |
| parent | 45cde5f6422dcee5ffbe6d5d4c482de738c2b053 (diff) | |
| download | scummvm-rg350-8e60e31db36b18fae9f95eb82db7bf1ad58fa668.tar.gz scummvm-rg350-8e60e31db36b18fae9f95eb82db7bf1ad58fa668.tar.bz2 scummvm-rg350-8e60e31db36b18fae9f95eb82db7bf1ad58fa668.zip | |
Changed the events.cpp file to EventDispatcher.cpp, to avoid MSVC name clashes with sdl/events.cpp
svn-id: r42790
| -rw-r--r-- | common/EventDispatcher.cpp (renamed from common/events.cpp) | 0 | ||||
| -rw-r--r-- | common/module.mk | 2 |
2 files changed, 1 insertions, 1 deletions
diff --git a/common/events.cpp b/common/EventDispatcher.cpp index 57765f9d13..57765f9d13 100644 --- a/common/events.cpp +++ b/common/EventDispatcher.cpp diff --git a/common/module.mk b/common/module.mk index 3ed7cecdab..d4f92f0791 100644 --- a/common/module.mk +++ b/common/module.mk @@ -5,7 +5,7 @@ MODULE_OBJS := \ config-file.o \ config-manager.o \ debug.o \ - events.o \ + EventDispatcher.o \ EventRecorder.o \ file.o \ fs.o \ |