NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit060b069

committed

Work around overly strict restrict checks by MSVC.

Apparently MSVC requires a * before a restrict in a variabledeclaration, even if the adorned type already is a pointer, just viatypedef.As reported by buildfarm animal woodlouse.Author: Andres FreundDiscussion:https://postgr.es/m/20171012001320.4putagiruuehtvb6@alap3.anarazel.de

1 parent4c119fb commit060b069Copy full SHA for 060b069

File tree

1 file changed

-5

lines changed

src/include/libpq
- pqformat.h

1 file changed

-5

lines changed

`‎src/include/libpq/pqformat.h`

Lines changed: 8 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -42,9 +42,12 @@ extern void pq_sendfloat8(StringInfo buf, float8 f);`
`42`	`42`	`* assumption that buf, buf->len, buf->data and *buf->data don't`
`43`	`43`	`* overlap. Without the annotation buf->len etc cannot be kept in a register`
`44`	`44`	`* over subsequent pq_writeint* calls.`
	`45`	`+ *`
	`46`	`+ * The use of StringInfoData * rather than StringInfo is due to MSVC being`
	`47`	`+ * overly picky and demanding a * before a restrict.`
`45`	`48`	`*/`
`46`	`49`	`staticinlinevoid`
`47`		`-pq_writeint8(StringInfo restrictbuf,int8i)`
	`50`	`+pq_writeint8(StringInfoData* restrictbuf,int8i)`
`48`	`51`	`{`
`49`	`52`	`int8ni=i;`
`50`	`53`
`@@ -58,7 +61,7 @@ pq_writeint8(StringInfo restrict buf, int8 i)`
`58`	`61`	`* preallocated.`
`59`	`62`	`*/`
`60`	`63`	`staticinlinevoid`
`61`		`-pq_writeint16(StringInfo restrictbuf,int16i)`
	`64`	`+pq_writeint16(StringInfoData* restrictbuf,int16i)`
`62`	`65`	`{`
`63`	`66`	`int16ni=pg_hton16(i);`
`64`	`67`
`@@ -72,7 +75,7 @@ pq_writeint16(StringInfo restrict buf, int16 i)`
`72`	`75`	`* preallocated.`
`73`	`76`	`*/`
`74`	`77`	`staticinlinevoid`
`75`		`-pq_writeint32(StringInfo restrictbuf,int32i)`
	`78`	`+pq_writeint32(StringInfoData* restrictbuf,int32i)`
`76`	`79`	`{`
`77`	`80`	`int32ni=pg_hton32(i);`
`78`	`81`
`@@ -86,7 +89,7 @@ pq_writeint32(StringInfo restrict buf, int32 i)`
`86`	`89`	`* preallocated.`
`87`	`90`	`*/`
`88`	`91`	`staticinlinevoid`
`89`		`-pq_writeint64(StringInfo restrictbuf,int64i)`
	`92`	`+pq_writeint64(StringInfoData* restrictbuf,int64i)`
`90`	`93`	`{`
`91`	`94`	`int64ni=pg_hton64(i);`
`92`	`95`
`@@ -106,7 +109,7 @@ pq_writeint64(StringInfo restrict buf, int64 i)`
`106`	`109`	`* sent to the frontend.`
`107`	`110`	`*/`
`108`	`111`	`staticinlinevoid`
`109`		`-pq_writestring(StringInfo restrictbuf,constchar*restrictstr)`
	`112`	`+pq_writestring(StringInfoData* restrictbuf,constchar*restrictstr)`
`110`	`113`	`{`
`111`	`114`	`intslen=strlen(str);`
`112`	`115`	`char*p;`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit060b069

File tree

1 file changed

1 file changed

`‎src/include/libpq/pqformat.h`

0 commit comments