From b5b9fd5f90bd11a9649fd345684204ce0a842b37 Mon Sep 17 00:00:00 2001 From: kkuznetsov Date: Fri, 27 Sep 2002 13:12:46 +0000 Subject: [PATCH] *** empty log message *** --- src/include/firebird.h | 5 ++++- src/jrd/common.h | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/include/firebird.h b/src/include/firebird.h index 42dc84cd01..2b9085a1c6 100644 --- a/src/include/firebird.h +++ b/src/include/firebird.h @@ -30,7 +30,7 @@ * John Bellardo * * - * $Id: firebird.h,v 1.3 2001-12-28 05:15:46 tamlin Exp $ + * $Id: firebird.h,v 1.4 2002-09-27 13:12:46 kkuznetsov Exp $ * */ @@ -42,6 +42,9 @@ #else #define FB_DLL_EXPORT #endif +#if defined(SOLX86) +#define __PRAGMA_REDEFINE_EXTNAME +#endif #ifdef __cplusplus #include "fb_exception.h" diff --git a/src/jrd/common.h b/src/jrd/common.h index 7b7059c2ef..b617d14665 100644 --- a/src/jrd/common.h +++ b/src/jrd/common.h @@ -35,7 +35,7 @@ * 2002.04.16 Paul Beach - HP10 and unistd.h */ /* -$Id: common.h,v 1.33 2002-09-25 06:22:42 kkuznetsov Exp $ +$Id: common.h,v 1.34 2002-09-27 13:12:46 kkuznetsov Exp $ */ #ifndef JRD_COMMON_H @@ -399,7 +399,7 @@ typedef RETSIGTYPE (*SIG_FPTR) (); #define MOVE_FASTER(from,to,length) memcpy (to, from, (int) (length)) #define MOVE_CLEAR(to,length) memset (to, 0, (int) (length)) -typedef RETSIGTYPE (*SIG_FPTR) (); +typedef RETSIGTYPE (*SIG_FPTR) (int); #endif /* sun */