diff options
| author | David Crocker <dcrocker@eschertech.com> | 2021-09-07 19:18:32 +0300 |
|---|---|---|
| committer | David Crocker <dcrocker@eschertech.com> | 2021-09-07 19:18:32 +0300 |
| commit | 8a84ba398149651fe014bfaae64c3e2fe79e7219 (patch) | |
| tree | b65051396c9884a468a700fe4b52c88e82d54f7c /src/Platform | |
| parent | e812e9408fb9b966cd8186364258f9150af5176f (diff) | |
Resolved name clashes and minor issues for eCv
Diffstat (limited to 'src/Platform')
| -rw-r--r-- | src/Platform/OutputMemory.h | 2 | ||||
| -rw-r--r-- | src/Platform/RepRap.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/Platform/OutputMemory.h b/src/Platform/OutputMemory.h index af47e8cf..831febe2 100644 --- a/src/Platform/OutputMemory.h +++ b/src/Platform/OutputMemory.h @@ -85,7 +85,7 @@ public: static size_t Truncate(OutputBuffer *buffer, size_t bytesNeeded) noexcept; // Release one OutputBuffer instance. Returns the next item from the chain or nullptr if this was the last instance. - __attribute((warn_unused_result)) static OutputBuffer *Release(OutputBuffer *buf) noexcept; + __attribute__((warn_unused_result)) static OutputBuffer *Release(OutputBuffer *buf) noexcept; // Release all OutputBuffer objects in a chain static void ReleaseAll(OutputBuffer * volatile &buf) noexcept; diff --git a/src/Platform/RepRap.h b/src/Platform/RepRap.h index 6ccfcb4a..e3c11e28 100644 --- a/src/Platform/RepRap.h +++ b/src/Platform/RepRap.h @@ -262,7 +262,7 @@ private: mutable Mutex messageBoxMutex; // mutable so that we can lock and release it in const functions - uint16_t boardsSeq, directoriesSeq, fansSeq, heatSeq, inputsSeq, jobSeq, moveSeq, globalSeq;; + uint16_t boardsSeq, directoriesSeq, fansSeq, heatSeq, inputsSeq, jobSeq, moveSeq, globalSeq; uint16_t networkSeq, scannerSeq, sensorsSeq, spindlesSeq, stateSeq, toolsSeq, volumesSeq; GlobalVariables globalVariables; |