--- rxvt-unicode/src/rxvtutil.h 2014/11/10 12:14:48 1.61 +++ rxvt-unicode/src/rxvtutil.h 2019/06/25 03:35:01 1.64 @@ -1,10 +1,12 @@ #ifndef RXVT_UTIL_H #define RXVT_UTIL_H -#include #include #include + +#define ECB_NO_THREADS 1 #include "ecb.h" + #include "estl.h" #include "emman.h" @@ -25,8 +27,6 @@ template static inline T clamp (T v, U a, V b) { return v < (T)a ? a : v >(T)b ? b : v; } template static inline void clamp_it (T &v, U a, V b) { v = v < (T)a ? a : v >(T)b ? b : v; } -template static inline T squared_diff (T a, T b) { return (a - b) * (a - b); } - // linear interpolation template static inline T @@ -63,10 +63,6 @@ void operator delete (void *p, size_t s); }; -// alas new/delete cannot be specified as inline in C++11 (see 17.6.4.6) -void *operator new (size_t s) throw (std::bad_alloc); -void operator delete (void *p) throw (); - struct stringvec : simplevec { ~stringvec ()