[IPCop-cvs] CVS: installer sundries.h,1.3,1.4

[Tim D. <st...@us...>]

Update of /cvsroot/ipcop/installer
In directory sc8-pr-cvs1:/tmp/cvs-serv5641

Modified Files:
	sundries.h 
Log Message:
Merging problem, go back to previous revision


Index: sundries.h
===================================================================
RCS file: /cvsroot/ipcop/installer/sundries.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** sundries.h	29 Mar 2003 22:33:10 -0000	1.3
--- sundries.h	29 Mar 2003 22:51:42 -0000	1.4
***************
*** 51,54 ****
--- 51,56 ----
  #if defined(__GNUC_MINOR__) && (__GNUC__  > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 5))
  void die (int errcode, const char *fmt, ...) __attribute__ ((noreturn));
+ #else /* GNUC < 2.5 */
+ void volatile die (int errcode, const char *fmt, ...);
  #endif /* GNUC < 2.5 */
  #else /* !__GNUC__ */