Skip to content

Commit 3c4b214

Browse files
author
Bryan Henderson
committed
Use proper types so it compiles on DEC C89. Thanks Erik Bertelson.
1 parent 5e98c40 commit 3c4b214

File tree

3 files changed

+10
-11
lines changed

3 files changed

+10
-11
lines changed

src/backend/tcop/dest.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/tcop/dest.c,v 1.3 1996/11/10 03:02:42 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/tcop/dest.c,v 1.4 1997/01/08 08:36:31 bryanh Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -45,12 +45,12 @@
4545
* output functions
4646
* ----------------
4747
*/
48-
void
49-
donothing(List *tuple, List *attrdesc)
48+
static void
49+
donothing(HeapTuple tuple, TupleDesc attrdesc)
5050
{
5151
}
5252

53-
void (*DestToFunction(CommandDest dest))()
53+
void (*DestToFunction(CommandDest dest))(HeapTuple, TupleDesc)
5454
{
5555
switch (dest) {
5656
case RemoteInternal:

src/backend/utils/adt/varlena.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/utils/adt/varlena.c,v 1.8 1996/11/08 05:59:51 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/utils/adt/varlena.c,v 1.9 1997/01/08 08:38:59 bryanh Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -297,8 +297,8 @@ text_lt(struct varlena *arg1, struct varlena *arg2)
297297
if (arg1 == NULL || arg2 == NULL)
298298
return((int32) 0);
299299

300-
a1p = VARDATA(arg1);
301-
a2p = VARDATA(arg2);
300+
a1p = (unsigned char *)VARDATA(arg1);
301+
a2p = (unsigned char *)VARDATA(arg2);
302302

303303
if ((len = arg1->vl_len) > arg2->vl_len)
304304
len = arg2->vl_len;
@@ -328,8 +328,8 @@ text_le(struct varlena *arg1, struct varlena *arg2)
328328
if (arg1 == NULL || arg2 == NULL)
329329
return((int32) 0);
330330

331-
a1p = VARDATA(arg1);
332-
a2p = VARDATA(arg2);
331+
a1p = (unsigned char *)VARDATA(arg1);
332+
a2p = (unsigned char *)VARDATA(arg2);
333333

334334
if ((len = arg1->vl_len) > arg2->vl_len)
335335
len = arg2->vl_len;

src/include/tcop/dest.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
*
2727
* Copyright (c) 1994, Regents of the University of California
2828
*
29-
* $Id: dest.h,v 1.4 1996/11/10 03:06:08 momjian Exp $
29+
* $Id: dest.h,v 1.5 1997/01/08 08:39:10 bryanh Exp $
3030
*
3131
*-------------------------------------------------------------------------
3232
*/
@@ -61,7 +61,6 @@ typedef struct AttrInfo {
6161
} AttrInfo;
6262
*/
6363

64-
extern void donothing(List *tuple, List *attrdesc);
6564
extern void (*DestToFunction(CommandDest dest))();
6665
extern void EndCommand(char *commandTag, CommandDest dest);
6766
extern void SendCopyBegin(void);

0 commit comments

Comments
 (0)