[MICO/mt-commit] CVS: mico/include CORBA.h,1.24,1.25

[Karel G. <kg...@us...>]

Update of /cvsroot/micomt/mico/include
In directory usw-pr-cvs1:/tmp/cvs-serv31844/include

Modified Files:
	CORBA.h 
Log Message:
- merged with MICO 2.3.7



Index: CORBA.h
===================================================================
RCS file: /cvsroot/micomt/mico/include/CORBA.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** CORBA.h	4 Jan 2002 09:19:09 -0000	1.24
--- CORBA.h	23 Mar 2002 20:17:14 -0000	1.25
***************
*** 32,36 ****
  #ifndef _POCKET_PC
  #include <sys/types.h>
- #include <fcntl.h> // Fixes 'fcntl' has not been defined yet message from HP aCC
  #include <errno.h>
  #endif
--- 32,35 ----
***************
*** 42,46 ****
  #undef MTDEBUG
  
! #ifdef _WINDOWS
  #include <mico/config-win32.h>
  #elif defined (_POCKET_PC)
--- 41,45 ----
  #undef MTDEBUG
  
! #if defined(_WINDOWS) && !defined(__MINGW32__)
  #include <mico/config-win32.h>
  #elif defined (_POCKET_PC)
***************
*** 133,148 ****
  #else
  
- #ifdef _WINDOWS
- #include <string>
- #include <vector>
- #include <map>
- #include <set>
- #include <list>
- #if !defined(__MINGW32__)
- #include <limits>
- #endif
- 
- #else
- 
  #include <string>
  #include <vector>
--- 132,135 ----
***************
*** 151,154 ****
--- 138,144 ----
  #include <list>
  #include <queue>
+ 
+ #if defined(_WINDOWS) && !defined(__MINGW32__)
+ #include <limits>
  #endif