I would change the "static inline" to "inline." "static inline" doesn't make any sense to me in an include file, but I'm not familiar with that code. I would also be working with 1.4.x instead of 1.5.x. And you know the client doesn't work, right?