Fixes for Irix from Robert Bruccoleri

This commit is contained in:
Bruce Momjian 1998-10-02 15:38:04 +00:00
parent 731ea8076f
commit 9b7c6ee00b
3 changed files with 12 additions and 7 deletions

View File

@ -48,6 +48,9 @@
# include <sys/ioctl.h>
# include <sys/param.h>
/* IRIX doesn't do 'long long' in va_arg(), so use a typedef */
typedef long long long_long;
/*
** SNPRINTF, VSNPRINT -- counted versions of printf
**
@ -70,7 +73,7 @@
* causing nast effects.
**************************************************************/
/*static char _id[] = "$Id: snprintf.c,v 1.7 1998/09/23 03:11:24 scrappy Exp $";*/
/*static char _id[] = "$Id: snprintf.c,v 1.8 1998/10/02 15:38:01 momjian Exp $";*/
static char *end;
static int SnprfOverflow;
@ -192,7 +195,7 @@ dopr (char *buffer, const char *format, ... )
case 'd': case 'D':
if( longflag ){
if( longlongflag ) {
value = va_arg( args, long long );
value = va_arg( args, long_long );
} else {
value = va_arg( args, long );
}

View File

@ -3,5 +3,4 @@
#define NO_EMPTY_STMTS
#define SYSV_DIRENT
#define HAS_TEST_AND_SET
#include <abi_mutex.h>
typedef abilock_t slock_t;
typedef unsigned long slock_t;

View File

@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/include/storage/s_lock.h,v 1.52 1998/10/02 15:23:08 momjian Exp $
* $Header: /cvsroot/pgsql/src/include/storage/s_lock.h,v 1.53 1998/10/02 15:38:04 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -261,8 +261,11 @@ tas(slock_t *s_lock)
#if defined(__sgi)
/*
* SGI IRIX 5
* slock_t is defined as a struct abilock_t, which has a single unsigned long
* member.
* slock_t is defined as a unsigned long. We use the standard SGI
* mutex API.
*
* The following comment is left for historical reasons, but is probably
* not a good idea since the mutex ABI is supported.
*
* This stuff may be supplemented in the future with Masato Kataoka's MIPS-II
* assembly from his NECEWS SVR4 port, but we probably ought to retain this