Date:	Sun, 02 Feb 2003 14:46:45 +0000
From:	"Richard Dawe" <rich AT phekda DOT freeserve DOT co DOT uk>
Sender:	rich AT phekda DOT freeserve DOT co DOT uk
To:	djgpp-workers AT delorie DOT com
X-Mailer:	Emacs 21.3.50 (via feedmail 8.3.emacs20_6 I) and Blat ver 1.8.6
Subject:	DJGPP headers & C99: <sys/exceptn.h> [PATCH]
Message-Id:	<E18fLMb-0000i5-00@phekda.freeserve.co.uk>
Reply-To:	djgpp-workers AT delorie DOT com

Hello.

<sys/exceptn.h> seems to have two sets of the usual #ifdef/#endif checks.
This looks like too much cut'n'pasting to me. Below is a diff that
removes the duplicate #ifdef/#endif checks and adds a C99 section.

OK to commit?

Thanks, bye, Rich =]

Index: include/sys/exceptn.h
===================================================================
RCS file: /cvs/djgpp/djgpp/include/sys/exceptn.h,v
retrieving revision 1.4
diff -p -c -3 -r1.4 exceptn.h
*** include/sys/exceptn.h	3 Jun 1999 17:22:29 -0000	1.4
--- include/sys/exceptn.h	2 Feb 2003 14:42:53 -0000
***************
*** 1,3 ****
--- 1,4 ----
+ /* Copyright (C) 2003 DJ Delorie, see COPYING.DJ for details */
  /* Copyright (C) 1999 DJ Delorie, see COPYING.DJ for details */
  /* Copyright (C) 1998 DJ Delorie, see COPYING.DJ for details */
  /* Copyright (C) 1995 DJ Delorie, see COPYING.DJ for details */
*************** extern "C" {
*** 10,24 ****
  
  #ifndef __dj_ENFORCE_ANSI_FREESTANDING
  
! #ifndef __STRICT_ANSI__
  
! #ifndef _POSIX_SOURCE
! 
! #ifdef __cplusplus
! extern "C" {
! #endif
! 
! #ifndef __dj_ENFORCE_ANSI_FREESTANDING
  
  #ifndef __STRICT_ANSI__
  
--- 11,20 ----
  
  #ifndef __dj_ENFORCE_ANSI_FREESTANDING
  
! #if (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) \
!   || !defined(__STRICT_ANSI__)
  
! #endif /* (__STDC_VERSION__ >= 199901L) || !__STRICT_ANSI__ */
  
  #ifndef __STRICT_ANSI__
  
*************** void __djgpp_exception_toggle(void);
*** 51,67 ****
  int  __djgpp_set_ctrl_c(int __enable);	/* On by default */
  int  __djgpp_set_sigint_key(int new_key);  /* Set key which raises SIGINT */
  int  __djgpp_set_sigquit_key(int new_key); /* Set key which raises SIGQUIT */
- 
- #endif /* !_POSIX_SOURCE */
- #endif /* !__STRICT_ANSI__ */
- #endif /* !__dj_ENFORCE_ANSI_FREESTANDING */
- 
- #ifndef __dj_ENFORCE_FUNCTION_CALLS
- #endif /* !__dj_ENFORCE_FUNCTION_CALLS */
- 
- #ifdef __cplusplus
- }
- #endif
  
  #endif /* !_POSIX_SOURCE */
  #endif /* !__STRICT_ANSI__ */
--- 47,52 ----

- Raw text -