Commitc2f5d08

Hiroshi Inoue

committed

Fix a lot of compile errors on unix.

Fix '\\' handling for bytea type.

1 parent1852951 commitc2f5d08Copy full SHA for c2f5d08

File tree

+252

-222

lines changed

+252

-222

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`#`
`3`	`3`	`# GNUMakefile for psqlodbc (Postgres ODBC driver)`
`4`	`4`	`#`
`5`		`-# $Header: /cvsroot/pgsql/src/interfaces/odbc/Attic/GNUmakefile,v 1.16 2001/05/11 01:46:33 momjian Exp $`
	`5`	`+# $Header: /cvsroot/pgsql/src/interfaces/odbc/Attic/GNUmakefile,v 1.17 2001/08/21 05:21:09 inoue Exp $`
`6`	`6`	`#`
`7`	`7`	`#-------------------------------------------------------------------------`
`8`	`8`
`@@ -21,7 +21,7 @@ override CPPFLAGS := -I$(srcdir) $(CPPFLAGS) -DHAVE_CONFIG_H -DODBCINSTDIR='"$(o`
`21`	`21`	`OBJS = info.o bind.o columninfo.o connection.o convert.o drvconn.o\`
`22`	`22`	`environ.o execute.o lobj.o misc.o options.o\`
`23`	`23`	`pgtypes.o psqlodbc.o qresult.o results.o socket.o parse.o statement.o\`
`24`		`- gpps.o tuple.o tuplelist.o dlg_specific.o$(OBJX)`
	`24`	`+ gpps.o tuple.o tuplelist.o dlg_specific.oodbcapi.o$(OBJX)`
`25`	`25`
`26`	`26`	`ifdefMULTIBYTE`
`27`	`27`	`OBJS += multibyte.o`

Lines changed: 10 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1969,8 +1969,16 @@ convert_from_pgbinary(unsigned char value, unsigned char rgbValue, int cbValue`
`1969`	`1969`	`{`
`1970`	`1970`	`if (value[i]=='\\')`
`1971`	`1971`	`{`
`1972`		`-rgbValue[o]=conv_from_octal(&value[i]);`
`1973`		`-i+=4;`
	`1972`	`+if (value[i+1]=='\\')`
	`1973`	`+{`
	`1974`	`+rgbValue[o]=value[i];`
	`1975`	`+i+=2;`
	`1976`	`+}`
	`1977`	`+else`
	`1978`	`+{`
	`1979`	`+rgbValue[o]=conv_from_octal(&value[i]);`
	`1980`	`+i+=4;`
	`1981`	`+}`
`1974`	`1982`	`}`
`1975`	`1983`	`else`
`1976`	`1984`	`rgbValue[o]=value[i++];`

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -682,7 +682,6 @@ PGAPI_GetInfo(`
`682`	`682`	`break;`
`683`	`683`
`684`	`684`	`default:`
`685`		`-returnPGAPI_GetInfo30(hdbc,fInfoType,rgbInfoValue,cbInfoValueMax,pcbInfoValue);`
`686`	`685`	`/* unrecognized key */`
`687`	`686`	`conn->errormsg="Unrecognized key passed to PGAPI_GetInfo.";`
`688`	`687`	`conn->errornumber=CONN_NOT_IMPLEMENTED_ERROR;`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ typedef signed short RETCODE;`
`26`	`26`	`#defineSQL_API EXPORT CALLBACK`
`27`	`27`	`#endif`
`28`	`28`
`29`		`-#defineODBCVER0x0250`
	`29`	`+/#define ODBCVER0x0250 /`
`30`	`30`
`31`	`31`	`#defineSQL_MAX_MESSAGE_LENGTH512`
`32`	`32`	`#defineSQL_MAX_DSN_LENGTH32`

Comments

(0)