*** include/omniORB2/CORBA_sysdep.h	Thu Jan  7 18:17:51 1999
--- newinclude/omniORB2/CORBA_sysdep.h	Tue Apr  6 09:30:04 1999
***************
*** 32,37 ****
--- 32,41 ----
  
  /*
   $Log: CORBA_sysdep.h,v $
+  Revision 1.30  1999/04/06 08:30:03  djr
+  MSVC 6.0 is also not FD compliant regarding declaration of static const
+  integral and enum types.
+ 
   Revision 1.29  1999/01/07 18:17:51  djr
   Enable namespaces on egcs 1.1.1
   MSVC and VMS platforms do not have strcasecmp and strncasecmp.
***************
*** 428,434 ****
  // be specified with a constant-initializer whereas ARM does not.
  // The _init_in_decl_ and _init_in_def_ macros are defined so that the same 
  // stub will compile on both FD and ARM compilers.
! // MSVC++ 5.0 is somewhere between FD and ARM.
  //
  #ifndef _init_in_decl_
  #define _init_in_decl_(x) x
--- 432,439 ----
  // be specified with a constant-initializer whereas ARM does not.
  // The _init_in_decl_ and _init_in_def_ macros are defined so that the same 
  // stub will compile on both FD and ARM compilers.
! // MSVC++ 5.0 (and 6.0) is somewhere between FD and ARM.
! //  _MSC_VER = 1100 for 5.0, 1200 for 6.0.
  //
  #ifndef _init_in_decl_
  #define _init_in_decl_(x) x
***************
*** 443,449 ****
  #endif
  
  #ifndef _init_in_cldecl_
! #  if !defined(_MSC_VER) || _MSC_VER > 1199
  #    define _init_in_cldecl_(x) x
  #  else
  #    define _init_in_cldecl_(x) 
--- 448,454 ----
  #endif
  
  #ifndef _init_in_cldecl_
! #  if !defined(_MSC_VER)
  #    define _init_in_cldecl_(x) x
  #  else
  #    define _init_in_cldecl_(x) 
***************
*** 453,459 ****
  #endif
  
  #ifndef _init_in_cldef_
! #  if !defined(_MSC_VER) || _MSC_VER > 1199
  #    define _init_in_cldef_(x)
  #  else
  #    define _init_in_cldef_(x) x 
--- 458,464 ----
  #endif
  
  #ifndef _init_in_cldef_
! #  if !defined(_MSC_VER)
  #    define _init_in_cldef_(x)
  #  else
  #    define _init_in_cldef_(x) x