[MinGW-cvs] CVS: w32api/include odbcinst.h,1.1.1.1,1.2 raserror.h,1.1.1.1,1.2 winnt.h,1.3,1.4

[Danny S. <dan...@us...>]

Update of /cvsroot/mingw/w32api/include
In directory usw-pr-cvs1:/tmp/cvs-serv24511/w32api/include

Modified Files:
	odbcinst.h raserror.h winnt.h 
Log Message:
	* include/winnt.h: Move CHAR, SHORT and LONG typedefs outside
	of block protected by #ifndef VOID.
	(This reverts 1998-12-01 Anders Norlander change.)
	* include/odbcinst.h: End file with newline.
	* include/raserror.h: Ditto.


Index: odbcinst.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/odbcinst.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** odbcinst.h	2001/06/05 01:36:40	1.1.1.1
--- odbcinst.h	2001/08/15 02:52:26	1.2
***************
*** 142,145 ****
  #ifdef __cplusplus
  }
! #endif 
! #endif /* _ODBCINST_H */
\ No newline at end of file
--- 142,145 ----
  #ifdef __cplusplus
  }
! #endif
! #endif /* _ODBCINST_H */

Index: raserror.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/raserror.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** raserror.h	2001/06/05 01:36:41	1.1.1.1
--- raserror.h	2001/08/15 02:52:26	1.2
***************
*** 204,206 ****
  #define ERROR_NO_EAPTLS_CERTIFICATE          (RASBASE+198)
  #define RASBASEEND                           (RASBASE+198)
! #endif /* _RASERROR_H */
\ No newline at end of file
--- 204,206 ----
  #define ERROR_NO_EAPTLS_CERTIFICATE          (RASBASE+198)
  #define RASBASEEND                           (RASBASE+198)
! #endif /* _RASERROR_H */

Index: winnt.h
===================================================================
RCS file: /cvsroot/mingw/w32api/include/winnt.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** winnt.h	2001/08/10 07:11:32	1.3
--- winnt.h	2001/08/15 02:52:26	1.4
***************
*** 42,49 ****
  #ifndef VOID
  #define VOID void
  typedef char CHAR;
  typedef short SHORT;
  typedef long LONG;
- #endif
  typedef CHAR CCHAR;
  typedef unsigned char UCHAR,*PUCHAR;
--- 42,49 ----
  #ifndef VOID
  #define VOID void
+ #endif
  typedef char CHAR;
  typedef short SHORT;
  typedef long LONG;
  typedef CHAR CCHAR;
  typedef unsigned char UCHAR,*PUCHAR;