Fix compilation on non-i386 machines. Inconsistent conditional compilation yielded definitions that we're used.
Fix compilation on non-i386 machines. Inconsistent conditional
compilation yielded definitions that we're used.

jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase