(upstream git commit ea45371bda1aa96fe63967c15e360b11d9d84bbd) Fix bad #define (upstream git commit b2ff838be24f5effae9ac4b75bd1897b710a60dc)