mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes for Irix from Robert Bruccoleri

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/backend/port/snprintf.c
View File

@ -48,6 +48,9 @@
# include <sys/ioctl.h> # include <sys/ioctl.h>
# include <sys/param.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 ** SNPRINTF, VSNPRINT -- counted versions of printf
** **
@ -70,7 +73,7 @@
* causing nast effects. * 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 char *end;
static int SnprfOverflow; static int SnprfOverflow;
@ -192,7 +195,7 @@ dopr (char *buffer, const char *format, ... )
case 'd': case 'D': case 'd': case 'D':
if( longflag ){ if( longflag ){
if( longlongflag ) { if( longlongflag ) {
value = va_arg( args, long long ); value = va_arg( args, long_long );
} else { } else {
value = va_arg( args, long ); value = va_arg( args, long );
} }

3
src/include/port/irix5.h
View File

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

9
src/include/storage/s_lock.h
View File

@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * 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) #if defined(__sgi)
/* /*
* SGI IRIX 5 * SGI IRIX 5
* slock_t is defined as a struct abilock_t, which has a single unsigned long * slock_t is defined as a unsigned long. We use the standard SGI
* member. * 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 * 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 * assembly from his NECEWS SVR4 port, but we probably ought to retain this