[Vxl-maintainers] changing WIN32 to VCL_WIN32

[Wheeler, F. (CRD) <wh...@cr...>]

I've been working on compiling VXL with cmake/nmake/VC6.0 within cygwin in Windows 2k.  When I do
this, WIN32 is not defined by the compiler.  I assume _WIN32 or __WIN32__ is, but I did not check.

So, I had a problem everywhere #ifdef WIN32 was used instead of #ifdef VCL_WIN32.  I changed it
wherever it caused me a direct problem, and added #include <vcl_compiler.h>, which defines VCL_WIN32.
Listed below are the many other remaining places where preprocessor macro WIN32 is used in VXL.  

Does anyone see a problem with me changing WIN32 to VCL_WIN32 in these remaining places?  I naturally
would not change anything in v3p, or vcl_compiler.h.  I'm not sure about vcl/emulation.

-Fred Wheeler



0% find . \
>   -type f \
>   \( -name \*.h -o -name \*xx -o -name \*pp \) \
>   -exec egrep -sq '[^_]WIN32' {} \; \
>   -print \
>   -exec egrep '[^_]WIN32' {} \; \
>   -exec echo \;
./gel/gevd/gevd_float_operators.cxx
#ifdef WIN32

./gel/gtrl/gtrl_triangulation.cxx
#ifdef WIN32

./oxl/VPLAYER/vplayer.cxx
#ifdef WIN32
#ifdef WIN32

./oxl/apps/vxl_vrml_viewer/main.cxx
#ifdef WIN32

./oxl/oxltest/StdAfx.h
#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers

./oxl/vgui/dll.h
#ifdef WIN32
#endif // WIN32

./oxl/vgui/vgui_glut.h
#ifdef xxxWIN32

./oxl/vgui/vgui_linker_hack.h
#ifdef WIN32
#ifdef WIN32

./oxl/vgui/vgui_rubberbander.cxx
#ifdef WIN32

./oxl/vgui/examples/geoff/vgui_testbed/vgui_testbed.cxx
#ifdef WIN32
#ifdef WIN32

./oxl/vgui/impl/Fl/vgui_Fl_window.cxx
#ifndef WIN32

./oxl/xcv/xcv_twoview_manager.cxx
#ifdef WIN32

./tbl/section/section.h
#ifdef WIN32

./v3p/Qv/QvBasic.h
#if defined(WIN32) || defined(__STDC__) || defined(__ANSI_CPP__)  /* ANSI C */

./v3p/Qv/QvLib.cxx
#ifndef WIN32

./v3p/png/pngconf.h
#if (defined(__MWERKS__) && defined(WIN32)) || defined(__STDC__)
       defined(WIN32) || defined(_WIN32) || defined(__WIN32__) \

./v3p/tiff/tiffcompat.h
#if defined(SYSV) || defined(THINK_C) || defined(applec) || defined(VMS) || defined(WIN32)
#ifdef WIN32

./v3p/tiff/tiffio.h
#if !defined(__WIN32__) && (defined(_WIN32) || defined(WIN32))

./v3p/zlib/zconf.h
#if (defined(_WIN32) || defined(__WIN32__)) && !defined(WIN32)
#  define WIN32
#if defined(__GNUC__) || defined(WIN32) || defined(__386__) || defined(i386)
#if (defined(MSDOS) || defined(_WINDOWS) || defined(WIN32))  && !defined(STDC)
#    ifdef WIN32
#    if (__BORLANDC__ >= 0x0500) && defined (WIN32)

./v3p/zlib/zutil.h
#ifdef WIN32 /* Window 95 & Windows NT */

./vcl/Templates/vcl_ostream_iterator+int-.cxx
#if !defined(VCL_SGI_CC) && !defined(WIN32) && !defined(GNU_LIBSTDCXX_V3) 

./vcl/vcl_compiler.h
#if defined(_WIN32) || defined(WIN32)

./vcl/vcl_complex.h
// ---------- native WIN32

./vcl/vcl_complex_fwd.h
// ---------- native WIN32

./vcl/emulation/vcl_hashtable.h
#if ( __STL_STATIC_TEMPLATE_DATA > 0 ) && ! defined (WIN32)
#if defined(WIN32)

./vcl/emulation/vcl_stlconf.h
# ifdef WIN32

./vxl/vbl/dll.h
#if defined(WIN32) && !defined(BUILDING_VBL_DLL)
#endif // WIN32 and !Building_*_dll

./vxl/vbl/vbl_bounding_box.txx
#ifdef WIN32

./vxl/vbl/vbl_hash_map.txx
#ifndef WIN32

./vxl/vnl/dll.h
#if defined(WIN32) && !defined(BUILDING_VNL_DLL)
#endif // WIN32 and !Building_*_dll

./vxl/vnl/vnl_real_polynomial.cxx
#ifdef WIN32

./vxl/vnl/algo/dll.h
#if defined(WIN32) && !defined(BUILDING_VNL_ALGO_DLL)
#endif // WIN32 and !Building_*_dll

./vxl/vul/vul_reg_exp.cxx
//#ifndef WIN32