[MICO/mt-commit] CVS: mico/cpp Makefile,1.1.1.2,1.2 cccp.c,1.1.1.1,1.2 config.h,1.1.1.2,1.2

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

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

Modified Files:
	Makefile cccp.c config.h 
Log Message:
- merged with MICO 2.3.7



Index: Makefile
===================================================================
RCS file: /cvsroot/micomt/mico/cpp/Makefile,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -C2 -r1.1.1.2 -r1.2
*** Makefile	6 Jan 2001 23:17:47 -0000	1.1.1.2
--- Makefile	23 Mar 2002 20:17:10 -0000	1.2
***************
*** 27,31 ****
  
  
! LDFLAGS  := -L. -L../orb $(LDFLAGS)
  LDLIBS   :=
  CFLAGS   := -DHAVE_CONFIG_H -I. -I../include $(CFLAGS)
--- 27,31 ----
  
  
! LDFLAGS  := -L. $(LDFLAGS)
  LDLIBS   :=
  CFLAGS   := -DHAVE_CONFIG_H -I. -I../include $(CFLAGS)

Index: cccp.c
===================================================================
RCS file: /cvsroot/micomt/mico/cpp/cccp.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** cccp.c	3 Nov 1999 23:20:51 -0000	1.1.1.1
--- cccp.c	23 Mar 2002 20:17:10 -0000	1.2
***************
*** 317,320 ****
--- 317,325 ----
  HOST_WIDE_INT parse_c_expression PROTO((char *));
  
+ #ifdef _WINDOWS
+ #define index strchr
+ #define rindex strrchr
+ #endif
+ 
  #ifndef errno
  extern int errno;

Index: config.h
===================================================================
RCS file: /cvsroot/micomt/mico/cpp/config.h,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -C2 -r1.1.1.2 -r1.2
*** config.h	6 Jan 2001 23:17:49 -0000	1.1.1.2
--- config.h	23 Mar 2002 20:17:10 -0000	1.2
***************
*** 1,3 ****
! #ifdef _WINDOWS
  #include <mico/config-win32.h>
  #include <io.h>
--- 1,3 ----
! #if defined(_WINDOWS) && !defined(__MINGW32__)
  #include <mico/config-win32.h>
  #include <io.h>
***************
*** 5,19 ****
  #include <stdlib.h>
  
- #ifndef __MINGW32__
  #pragma warning (disable: 4018)
  char *index( char *s, char c );
  char *rindex( char *s, char c );
  #else
  #define index(s,c) strchr(s,c)
  #define rindex(s,c) strrchr(s,c)
  #endif
  
- #else
- #include <mico/config.h>
  #endif
  
--- 5,21 ----
  #include <stdlib.h>
  
  #pragma warning (disable: 4018)
  char *index( char *s, char c );
  char *rindex( char *s, char c );
+ 
  #else
+ 
+ #include <mico/config.h>
+ 
+ #ifdef __MINGW32__
  #define index(s,c) strchr(s,c)
  #define rindex(s,c) strrchr(s,c)
  #endif
  
  #endif