Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

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

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitfba790a

Browse files
committed
Makeover for Unixware 7.1.1
* Makefile: Add more standard targets. Improve shell redirection in GNUmake detection.* src/backend/access/transam/rmgr.c: Fix incorrect(?) C.* src/backend/libpq/pqcomm.c (StreamConnection): Work around accept() bug.* src/include/port/unixware.h: ...with help from here.* src/backend/nodes/print.c (plannode_type): Remove some "break"s after"return"s.* src/backend/tcop/dest.c (DestToFunction): ditto.* src/backend/nodes/readfuncs.c: Add proper prototypes.* src/backend/utils/adt/numutils.c (pg_atoi): Cope specially with strtol()setting EINVAL. This saves us from creating an extra set of regression testoutput for the affected systems.* src/include/storage/s_lock.h (tas): Correct prototype.* src/interfaces/libpq/fe-connect.c (parseServiceInfo): Don't use variableas dimension in array definition.* src/makefiles/Makefile.unixware: Add support for GCC.* src/template/unixware: same here* src/test/regress/expected/abstime-solaris-1947.out: Adjust whitespace.* src/test/regress/expected/horology-solaris-1947.out: Part of this filewas evidently missing.* src/test/regress/pg_regress.sh: Fix shell. mkdir -p returns non-zero ifthe directory exists.* src/test/regress/resultmap: Add entries for Unixware.
1 parent3c5d000 commitfba790a

File tree

16 files changed

+160
-107
lines changed

16 files changed

+160
-107
lines changed

‎Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
# GNUmakefile won't exist yet, so we catch that case as well.
1212

1313

14-
allinstallcleandepdependdistcleanmaintainer-clean:
14+
allcheckinstallinstalldirsinstallcheckuninstalldepdependcleandistcleanmaintainer-clean:
1515
@if! [-f GNUmakefile ];then\
1616
echo"You need to run the\`configure' program first. See the file";\
1717
echo"\`INSTALL' for installation instructions.";\
@@ -20,7 +20,7 @@ all install clean dep depend distclean maintainer-clean:
2020
@IFS=':';\
2121
fordirin$$PATH;do \
2222
forprogin gmake gnumake make;do \
23-
if [-f$$dir/$$prog ]&& ($$dir/$$prog --version| grep GNU>/dev/null2>&1 );then \
23+
if [-f$$dir/$$prog ]&& ($$dir/$$prog --version2>/dev/null| grep GNU>/dev/null2>&1 );then \
2424
GMAKE=$$dir/$$prog;\
2525
break 2;\
2626
fi;\

‎src/backend/access/transam/rmgr.c

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,12 @@ RmgrData RmgrTable[] = {
5252
{"Gist",gist_redo,gist_undo,gist_desc}
5353
};
5454

55-
#else
55+
#else/* not XLOG */
5656

57-
RmgrDataRmgrTable[]= {};
57+
/*
58+
* This is a dummy, but don't write RmgrTable[] = {} here,
59+
* that's not accepted by some compilers. -- petere
60+
*/
61+
RmgrDataRmgrTable[1];
5862

59-
#endif
63+
#endif/* not XLOG */

‎src/backend/libpq/pqcomm.c

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
* Portions Copyright (c) 1996-2000, PostgreSQL, Inc
3030
* Portions Copyright (c) 1994, Regents of the University of California
3131
*
32-
*$Id: pqcomm.c,v 1.106 2000/10/14 23:56:58 momjian Exp $
32+
*$Id: pqcomm.c,v 1.107 2000/10/22 22:14:54 petere Exp $
3333
*
3434
*-------------------------------------------------------------------------
3535
*/
@@ -332,6 +332,15 @@ StreamConnection(int server_fd, Port *port)
332332
returnSTATUS_ERROR;
333333
}
334334

335+
#ifdefPG_ON_UNIXWARE
336+
/*
337+
* Only UnixWare 7+ are known to have this bug, but it shouldn't
338+
* hurt it catch if for all of them.
339+
*/
340+
if (port->raddr.sa.sa_family==0)
341+
port->raddr.sa.sa_family=AF_UNIX;
342+
#endif
343+
335344
/* fill in the server (local) address */
336345
addrlen=sizeof(port->laddr);
337346
if (getsockname(port->sock, (structsockaddr*)&port->laddr,

‎src/backend/nodes/print.c

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/nodes/print.c,v 1.43 2000/10/05 19:11:27 tgl Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/nodes/print.c,v 1.44 2000/10/22 22:14:54 petere Exp $
1212
*
1313
* HISTORY
1414
* AUTHORDATEMAJOR EVENT
@@ -292,64 +292,44 @@ plannode_type(Plan *p)
292292
{
293293
caseT_Plan:
294294
return"PLAN";
295-
break;
296295
caseT_Result:
297296
return"RESULT";
298-
break;
299297
caseT_Append:
300298
return"APPEND";
301-
break;
302299
caseT_Scan:
303300
return"SCAN";
304-
break;
305301
caseT_SeqScan:
306302
return"SEQSCAN";
307-
break;
308303
caseT_IndexScan:
309304
return"INDEXSCAN";
310-
break;
311305
caseT_TidScan:
312306
return"TIDSCAN";
313-
break;
314307
caseT_SubqueryScan:
315308
return"SUBQUERYSCAN";
316-
break;
317309
caseT_Join:
318310
return"JOIN";
319-
break;
320311
caseT_NestLoop:
321312
return"NESTLOOP";
322-
break;
323313
caseT_MergeJoin:
324314
return"MERGEJOIN";
325-
break;
326315
caseT_HashJoin:
327316
return"HASHJOIN";
328-
break;
329317
caseT_Material:
330318
return"MATERIAL";
331-
break;
332319
caseT_Sort:
333320
return"SORT";
334-
break;
335321
caseT_Agg:
336322
return"AGG";
337-
break;
338323
caseT_Unique:
339324
return"UNIQUE";
340-
break;
341325
caseT_SetOp:
342326
return"SETOP";
343-
break;
344327
caseT_Hash:
345328
return"HASH";
346-
break;
347329
caseT_Group:
348330
return"GROUP";
349-
break;
350331
default:
351332
return"UNKNOWN";
352-
break;
353333
}
354334
}
355335

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp