diff Makefile.osx.universal @ 46:af9c4cee95a8

VC++ fixes.
Much of this is changing "and" to "&&".  I had never realised
until today that "and" is in fact a keyword in C++, albeit not
one that has been there since the start, so this should compile
(I eventually looked this up having been puzzled by how this
code could ever build with any other compiler).  However,
despite its keywordness, "and" still doesn't seem to be acceptable
to VC++.  Possibly there's an option to change this, or one could
use a macro -- but why not just stick with the token that compilers
are known to like?