diff options
| author |  ridiculousfish <corydoras@ridiculousfish.com> | 2014-06-18 10:14:35 -0700 |
|---|---|---|
| committer | ridiculousfish <corydoras@ridiculousfish.com> | 2014-06-18 10:14:35 -0700 |
| commit | ee8e9c0291b2c7525a8470765bd88166b25e9b6b (patch) | |
| tree | f571917561c934b094cba21f957fbc252ed72a04 /input_common.cpp | |
| parent | 3513ce3ac0de4a4cf9ebb5d273a19c8aaaa9b942 (diff) | |
Remove env_universal.h and env_universal.cpp from project
Diffstat (limited to 'input_common.cpp')
| -rw-r--r-- | input_common.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/input_common.cpp b/input_common.cpp index e6393124..513fd8e3 100644 --- a/input_common.cpp +++ b/input_common.cpp @@ -16,6 +16,7 @@ Implementation file for the low level input library #include <wchar.h> #include <stack> #include <list> +#include <queue> #ifdef HAVE_SYS_SELECT_H #include <sys/select.h> #endif @@ -26,7 +27,7 @@ Implementation file for the low level input library #include "common.h" #include "wutil.h" #include "input_common.h" -#include "env_universal.h" +#include "env_universal_common.h" #include "iothread.h" /** @@ -37,9 +38,9 @@ Implementation file for the low level input library #define WAIT_ON_ESCAPE 10 /** Characters that have been read and returned by the sequence matching code */ -static std::stack<wint_t, std::list<wint_t> > lookahead_list; +static std::stack<wint_t, std::vector<wint_t> > lookahead_list; -/* Queue of pairs of (function pointer, argument) to be invoked */ +/* Queue of pairs of (function pointer, argument) to be invoked. Expected to be mostly empty. */ typedef std::pair<void (*)(void *), void *> callback_info_t; typedef std::queue<callback_info_t, std::list<callback_info_t> > callback_queue_t; static callback_queue_t callback_queue; |