diff options
author | Dan Gudmundsson <[email protected]> | 2018-12-07 13:22:46 +0100 |
---|---|---|
committer | Dan Gudmundsson <[email protected]> | 2018-12-07 13:22:46 +0100 |
commit | fae4c020d457d6c1b51284cb510e2b9801df0108 (patch) | |
tree | e2295cf281f16b260956efe1d5ae3fd48862cfd9 /lib/wx/c_src/wxe_helpers.cpp | |
parent | 6bc06074995e67f73608ed13c30f0efe0ad8f40c (diff) | |
parent | d65ccad5d6bc71fda09ce6bf3a220a536a9a6b62 (diff) | |
download | otp-fae4c020d457d6c1b51284cb510e2b9801df0108.tar.gz otp-fae4c020d457d6c1b51284cb510e2b9801df0108.tar.bz2 otp-fae4c020d457d6c1b51284cb510e2b9801df0108.zip |
Merge branch 'maint'
* maint:
Don't try to wake up wx thread when not necessary
Diffstat (limited to 'lib/wx/c_src/wxe_helpers.cpp')
-rw-r--r-- | lib/wx/c_src/wxe_helpers.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/wx/c_src/wxe_helpers.cpp b/lib/wx/c_src/wxe_helpers.cpp index d1f607d2af..47955494f9 100644 --- a/lib/wx/c_src/wxe_helpers.cpp +++ b/lib/wx/c_src/wxe_helpers.cpp @@ -101,7 +101,7 @@ wxeCommand * wxeFifo::Peek(unsigned int *i) } -void wxeFifo::Add(int fc, char * cbuf,int buflen, wxe_data *sd) +int wxeFifo::Add(int fc, char * cbuf,int buflen, wxe_data *sd) { unsigned int pos; wxeCommand *curr; @@ -144,6 +144,7 @@ void wxeFifo::Add(int fc, char * cbuf,int buflen, wxe_data *sd) } else { // No-op only PING currently curr->buffer = NULL; } + return m_n; } void wxeFifo::Append(wxeCommand *orig) |