src: wrap macros in `do {...} while (0)`

Wrapped two macros in do {...} while (0) blocks and lined up
backslashes.  Uses up semicolon in contexts where a dangling semicolon
is erroneous.
src: replace ngx-queue.h with queue.h

No functional changes, just one less entry in the LICENSE file.