O_NONBLOCK vs IO_NDELAY: what to use where?

[Norbert Koch]

Hello.

In releng-4 the device driver's
read/write functions check for
non-blocking i/o using
  (flag & IO_NDELAY)
Is that changed in current to
O_NONBLOCK?

As I understand:

#include <vnode.h>
IO_NDELAY
for releng-4

and

#include <fcntl.h>
O_NONBLOCK
for current.

Correct?
If yes, what exact version should I test for?

Thank you,

Norbert Koch