firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-22 16:43:03 +01:00
Code Issues

Add check for caddr_t to fix compile error on Solaris munmap,

Browse Source 
some more warnings to prefix solx86gcc, comment historycal pragmas
This commit is contained in:
kkuznetsov 2004-05-13 14:05:00 +00:00
parent 5e0541ab98
commit 234fdb0e43
4 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
builds/posix/prefix.solx86gcc
View File

@ -14,11 +14,11 @@
#
# All Rights Reserved.
# Contributor(s): __Konstantin Kuznetsov___________________________________.
# This file can be used to build FB on Solaris 8 x 86 with gcc 3.3.3 and bash
# This file can be used to build FB on Solaris 2.6 x 86 with gcc 3.3.3 and bash
#
# Use SOLX86 to identify x86 version of Solaris. Neil McCalden
#
# $Id: prefix.solx86gcc,v 1.9 2004-05-06 11:40:48 kkuznetsov Exp $
# $Id: prefix.solx86gcc,v 1.10 2004-05-13 14:05:00 kkuznetsov Exp $
#
# Start of file prefix.solaris X 86 : $(VERSION) $(PLATFORM)
# 2 Oct 2002, Nickolay Samofatov - Major Cleanup
@ -26,7 +26,7 @@
#FirebirdInstallPrefix = @prefix@
WARNINGS=-Wall -W -Wno-unused -Wno-parentheses -Wno-switch
WARNINGS=-Wall -W -Wno-unused -Wno-parentheses -Wno-switch -Wwrite-strings
COMM_SOLX_FLAGS:=-DSOLARIS -DSOLARIS26 -DSOLARIS_MT -DSOLX86 -DBSD_COMP -fno-omit-frame-pointer -fmessage-length=0 -MMD -p -fPIC
#SFIO= /export/home/interbase/SfIO

3
configure.in
View File

@ -1,4 +1,4 @@
dnl $Id: configure.in,v 1.198 2004-05-03 11:31:54 eku Exp $
dnl $Id: configure.in,v 1.199 2004-05-13 14:04:47 kkuznetsov Exp $
dnl ############################# INITIALISATION ###############################
@ -553,6 +553,7 @@ case "$PLATFORM" in
dnl kkuznetsov: Solaris always check for -lnsl
AC_CHECK_LIB(nsl, gethostname, XE_APPEND(-lnsl,LIBS))
AC_CHECK_LIB(thread, main)
AC_CHECK_TYPES([caddr_t])
AC_ARG_WITH(sfio,
AC_HELP_STRING([--with-sfio=PATH],

8
src/common/classes/alloc.cpp
View File

@ -32,7 +32,7 @@
* Contributor(s):
*
*
* $Id: alloc.cpp,v 1.50 2004-05-12 19:17:09 brodsom Exp $
* $Id: alloc.cpp,v 1.51 2004-05-13 14:04:51 kkuznetsov Exp $
*
*/
@ -339,8 +339,14 @@ void MemoryPool::external_free(void *blk, size_t &size) {
system_call_failed::raise("VirtualFree");
#elif defined HAVE_MMAP
size = FB_ALIGN(size, map_page_size);
#if (defined SOLARIS) and (defined HAVE_CADDR_T)
if (munmap((caddr_t) blk, size))
system_call_failed::raise("munmap");
#else
if (munmap(blk, size))
system_call_failed::raise("munmap");
#endif /*Solaris*/
#else
::free(blk);
#endif

4
src/include/firebird.h
View File

@ -30,7 +30,7 @@
* John Bellardo <bellardo@cs.ucsd.edu>
*
*
* $Id: firebird.h,v 1.18 2004-03-25 23:12:44 skidder Exp $
* $Id: firebird.h,v 1.19 2004-05-13 14:04:55 kkuznetsov Exp $
*
*/
@ -43,8 +43,10 @@
#define FB_DLL_EXPORT
#endif
#if defined(SOLX86)
/* this pragmas is used only with gcc 2.95!
#define __PRAGMA_REDEFINE_EXTNAME
#define __EXTENSIONS__
*/
#endif
//