Commit9b7c6ee

committed

Fixes for Irix from Robert Bruccoleri

1 parent731ea80 commit9b7c6eeCopy full SHA for 9b7c6ee

File tree

+12

-7

lines changed

+12

-7

lines changed

Lines changed: 5 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,9 @@`
`48`	`48`	`# include<sys/ioctl.h>`
`49`	`49`	`# include<sys/param.h>`
`50`	`50`
	`51`	`+/* IRIX doesn't do 'long long' in va_arg(), so use a typedef */`
	`52`	`+typedeflong longlong_long;`
	`53`	`+`
`51`	`54`	`/*`
`52`	`55`	`** SNPRINTF, VSNPRINT -- counted versions of printf`
`53`	`56`	`**`
`@@ -70,7 +73,7 @@`
`70`	`73`	`* causing nast effects.`
`71`	`74`	`**************************************************************/`
`72`	`75`
`73`		`-/static char _id[] = "$Id: snprintf.c,v 1.7 1998/09/23 03:11:24 scrappy Exp $";/`
	`76`	`+/static char _id[] = "$Id: snprintf.c,v 1.8 1998/10/02 15:38:01 momjian Exp $";/`
`74`	`77`	`staticchar*end;`
`75`	`78`	`staticintSnprfOverflow;`
`76`	`79`
`@@ -192,7 +195,7 @@ dopr (char buffer, const char format, ... )`
`192`	`195`	`case'd':case'D':`
`193`	`196`	`if(longflag ){`
`194`	`197`	`if(longlongflag ) {`
`195`		`-value=va_arg(args,longlong );`
	`198`	`+value=va_arg(args,long_long );`
`196`	`199`	`}else {`
`197`	`200`	`value=va_arg(args,long );`
`198`	`201`	`}`

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,5 +3,4 @@`
`3`	`3`	`#defineNO_EMPTY_STMTS`
`4`	`4`	`#defineSYSV_DIRENT`
`5`	`5`	`#defineHAS_TEST_AND_SET`
`6`		`-#include<abi_mutex.h>`
`7`		`-typedefabilock_tslock_t;`
	`6`	`+typedefunsigned longslock_t;`

Lines changed: 6 additions & 3 deletions

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

Comments

(0)