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

Commita47e20b

Browse files
committed
Several compilation and run-time problems occur when building on SGI
IRIX systems using the native compilers. A summary is:- Various files use "//" as a comment delimiter in c files.- Problems caused by assuming "char" is signed. cash.in: building -signed the rules regression test fails as described in FAQ_QNX4. If CHAR_MAX is "255U" then ((signed char)CHAR_MAX) is -1. postmaster.c: random number regression test failed without this change.- Some generic build issues and warning message cleanup.David Kaelbling
1 parent5128d14 commita47e20b

32 files changed

+726
-671
lines changed

‎src/Makefile.shlib‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# Copyright (c) 1998, Regents of the University of California
77
#
88
# IDENTIFICATION
9-
# $Header: /cvsroot/pgsql/src/Makefile.shlib,v 1.19 2000/03/09 17:07:32 momjian Exp $
9+
# $Header: /cvsroot/pgsql/src/Makefile.shlib,v 1.20 2000/05/16 20:48:48 momjian Exp $
1010
#
1111
#-------------------------------------------------------------------------
1212

@@ -137,8 +137,8 @@ endif
137137

138138
ifeq ($(PORTNAME), irix5)
139139
install-shlib-dep := install-shlib
140-
shlib := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
141-
LDFLAGS_SL := -shared -rpath $(LIBDIR)
140+
shlib := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION)
141+
LDFLAGS_SL := -shared -rpath $(LIBDIR) -set_version sgi$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
142142
CFLAGS += $(CFLAGS_SL)
143143
endif
144144

‎src/backend/storage/ipc/ipc.c‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipc.c,v 1.46 2000/04/12 17:15:36 momjian Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipc.c,v 1.47 2000/05/16 20:48:48 momjian Exp $
1212
*
1313
* NOTES
1414
*
@@ -236,6 +236,7 @@ IPCPrivateSemaphoreKill(int status,
236236
intsemId)/* caddr_t */
237237
{
238238
unionsemunsemun;
239+
semun.val=0;/* unused */
239240

240241
semctl(semId,0,IPC_RMID,semun);
241242
}
@@ -373,6 +374,7 @@ IpcSemaphoreKill(IpcSemaphoreKey key)
373374
{
374375
intsemId;
375376
unionsemunsemun;
377+
semun.val=0;/* unused */
376378

377379
/* kill semaphore if existent */
378380

@@ -475,6 +477,7 @@ IpcSemaphoreGetCount(IpcSemaphoreId semId, int sem)
475477
{
476478
intsemncnt;
477479
unionsemundummy;/* for Solaris */
480+
dummy.val=0;/* unused */
478481

479482
semncnt=semctl(semId,sem,GETNCNT,dummy);
480483
returnsemncnt;
@@ -485,6 +488,7 @@ IpcSemaphoreGetValue(IpcSemaphoreId semId, int sem)
485488
{
486489
intsemval;
487490
unionsemundummy;/* for Solaris */
491+
dummy.val=0;/* unused */
488492

489493
semval=semctl(semId,sem,GETVAL,dummy);
490494
returnsemval;

‎src/backend/utils/adt/cash.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* workings can be found in the book "Software Solutions in C" by
1010
* Dale Schumacher, Academic Press, ISBN: 0-12-632360-7.
1111
*
12-
* $Header: /cvsroot/pgsql/src/backend/utils/adt/cash.c,v 1.35 2000/04/12 17:15:48 momjian Exp $
12+
* $Header: /cvsroot/pgsql/src/backend/utils/adt/cash.c,v 1.36 2000/05/16 20:48:49 momjian Exp $
1313
*/
1414

1515
#include<limits.h>
@@ -74,7 +74,7 @@ cash_in(const char *str)
7474

7575
/* frac_digits in the C locale seems to return CHAR_MAX */
7676
/* best guess is 2 in this case I think */
77-
fpoint= ((lconvert->frac_digits!=CHAR_MAX) ?lconvert->frac_digits :2);/* int_frac_digits? */
77+
fpoint= ((lconvert->frac_digits!=(char)CHAR_MAX) ?lconvert->frac_digits :2);/* int_frac_digits? */
7878

7979
dsymbol= ((*lconvert->mon_decimal_point!='\0') ?*lconvert->mon_decimal_point :'.');
8080
ssymbol= ((*lconvert->mon_thousands_sep!='\0') ?*lconvert->mon_thousands_sep :',');
@@ -225,7 +225,7 @@ cash_out(Cash *in_value)
225225
comma= ((*lconvert->mon_thousands_sep!='\0') ?*lconvert->mon_thousands_sep :',');
226226
/* frac_digits in the C locale seems to return CHAR_MAX */
227227
/* best guess is 2 in this case I think */
228-
points= ((lconvert->frac_digits!=CHAR_MAX) ?lconvert->frac_digits :2);/* int_frac_digits? */
228+
points= ((lconvert->frac_digits!=(char)CHAR_MAX) ?lconvert->frac_digits :2);/* int_frac_digits? */
229229
convention=lconvert->n_sign_posn;
230230
dsymbol= ((*lconvert->mon_decimal_point!='\0') ?*lconvert->mon_decimal_point :'.');
231231
csymbol= ((*lconvert->currency_symbol!='\0') ?lconvert->currency_symbol :"$");
@@ -244,7 +244,7 @@ cash_out(Cash *in_value)
244244

245245
/* We're playing a little fast and loose with this. Shoot me. */
246246
/* Not me, that was the other guy. Haven't fixed it yet - thomas */
247-
if (!mon_group||mon_group==CHAR_MAX)
247+
if (!mon_group||mon_group==(char)CHAR_MAX)
248248
mon_group=3;
249249

250250
/* allow more than three decimal points and separate them */

‎src/backend/utils/fmgr/fmgr.c‎

Lines changed: 47 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/utils/fmgr/fmgr.c,v 1.37 2000/01/26 05:57:22 momjian Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/utils/fmgr/fmgr.c,v 1.38 2000/05/16 20:48:50 momjian Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -172,13 +172,16 @@ fmgr_c(FmgrInfo *finfo,
172172
values->data[6],values->data[7],
173173
values->data[8]);
174174
break;
175+
#ifFUNC_MAX_ARGS >=10
175176
case10:
176177
returnValue= (*user_fn) (values->data[0],values->data[1],
177178
values->data[2],values->data[3],
178179
values->data[4],values->data[5],
179180
values->data[6],values->data[7],
180181
values->data[8],values->data[9]);
181182
break;
183+
#endif
184+
#ifFUNC_MAX_ARGS >=11
182185
case11:
183186
returnValue= (*user_fn) (values->data[0],values->data[1],
184187
values->data[2],values->data[3],
@@ -187,6 +190,8 @@ fmgr_c(FmgrInfo *finfo,
187190
values->data[8],values->data[9],
188191
values->data[10]);
189192
break;
193+
#endif
194+
#ifFUNC_MAX_ARGS >=12
190195
case12:
191196
returnValue= (*user_fn) (values->data[0],values->data[1],
192197
values->data[2],values->data[3],
@@ -195,6 +200,8 @@ fmgr_c(FmgrInfo *finfo,
195200
values->data[8],values->data[9],
196201
values->data[10],values->data[11]);
197202
break;
203+
#endif
204+
#ifFUNC_MAX_ARGS >=13
198205
case13:
199206
returnValue= (*user_fn) (values->data[0],values->data[1],
200207
values->data[2],values->data[3],
@@ -204,6 +211,8 @@ fmgr_c(FmgrInfo *finfo,
204211
values->data[10],values->data[11],
205212
values->data[12]);
206213
break;
214+
#endif
215+
#ifFUNC_MAX_ARGS >=14
207216
case14:
208217
returnValue= (*user_fn) (values->data[0],values->data[1],
209218
values->data[2],values->data[3],
@@ -213,6 +222,8 @@ fmgr_c(FmgrInfo *finfo,
213222
values->data[10],values->data[11],
214223
values->data[12],values->data[13]);
215224
break;
225+
#endif
226+
#ifFUNC_MAX_ARGS >=15
216227
case15:
217228
returnValue= (*user_fn) (values->data[0],values->data[1],
218229
values->data[2],values->data[3],
@@ -223,6 +234,8 @@ fmgr_c(FmgrInfo *finfo,
223234
values->data[12],values->data[13],
224235
values->data[14]);
225236
break;
237+
#endif
238+
#ifFUNC_MAX_ARGS >=16
226239
case16:
227240
returnValue= (*user_fn) (values->data[0],values->data[1],
228241
values->data[2],values->data[3],
@@ -233,6 +246,8 @@ fmgr_c(FmgrInfo *finfo,
233246
values->data[12],values->data[13],
234247
values->data[14],values->data[15]);
235248
break;
249+
#endif
250+
#ifFUNC_MAX_ARGS >=17
236251
case17:
237252
returnValue= (*user_fn) (values->data[0],values->data[1],
238253
values->data[2],values->data[3],
@@ -244,6 +259,8 @@ fmgr_c(FmgrInfo *finfo,
244259
values->data[14],values->data[15],
245260
values->data[16]);
246261
break;
262+
#endif
263+
#ifFUNC_MAX_ARGS >=18
247264
case18:
248265
returnValue= (*user_fn) (values->data[0],values->data[1],
249266
values->data[2],values->data[3],
@@ -255,6 +272,8 @@ fmgr_c(FmgrInfo *finfo,
255272
values->data[14],values->data[15],
256273
values->data[16],values->data[17]);
257274
break;
275+
#endif
276+
#ifFUNC_MAX_ARGS >=19
258277
case19:
259278
returnValue= (*user_fn) (values->data[0],values->data[1],
260279
values->data[2],values->data[3],
@@ -267,6 +286,8 @@ fmgr_c(FmgrInfo *finfo,
267286
values->data[16],values->data[17],
268287
values->data[18]);
269288
break;
289+
#endif
290+
#ifFUNC_MAX_ARGS >=20
270291
case20:
271292
returnValue= (*user_fn) (values->data[0],values->data[1],
272293
values->data[2],values->data[3],
@@ -279,6 +300,8 @@ fmgr_c(FmgrInfo *finfo,
279300
values->data[16],values->data[17],
280301
values->data[18],values->data[19]);
281302
break;
303+
#endif
304+
#ifFUNC_MAX_ARGS >=21
282305
case21:
283306
returnValue= (*user_fn) (values->data[0],values->data[1],
284307
values->data[2],values->data[3],
@@ -292,6 +315,8 @@ fmgr_c(FmgrInfo *finfo,
292315
values->data[18],values->data[19],
293316
values->data[20]);
294317
break;
318+
#endif
319+
#ifFUNC_MAX_ARGS >=22
295320
case22:
296321
returnValue= (*user_fn) (values->data[0],values->data[1],
297322
values->data[2],values->data[3],
@@ -305,6 +330,8 @@ fmgr_c(FmgrInfo *finfo,
305330
values->data[18],values->data[19],
306331
values->data[20],values->data[21]);
307332
break;
333+
#endif
334+
#ifFUNC_MAX_ARGS >=23
308335
case23:
309336
returnValue= (*user_fn) (values->data[0],values->data[1],
310337
values->data[2],values->data[3],
@@ -319,6 +346,8 @@ fmgr_c(FmgrInfo *finfo,
319346
values->data[20],values->data[21],
320347
values->data[22]);
321348
break;
349+
#endif
350+
#ifFUNC_MAX_ARGS >=24
322351
case24:
323352
returnValue= (*user_fn) (values->data[0],values->data[1],
324353
values->data[2],values->data[3],
@@ -333,6 +362,8 @@ fmgr_c(FmgrInfo *finfo,
333362
values->data[20],values->data[21],
334363
values->data[22],values->data[23]);
335364
break;
365+
#endif
366+
#ifFUNC_MAX_ARGS >=25
336367
case25:
337368
returnValue= (*user_fn) (values->data[0],values->data[1],
338369
values->data[2],values->data[3],
@@ -348,6 +379,8 @@ fmgr_c(FmgrInfo *finfo,
348379
values->data[22],values->data[23],
349380
values->data[24]);
350381
break;
382+
#endif
383+
#ifFUNC_MAX_ARGS >=26
351384
case26:
352385
returnValue= (*user_fn) (values->data[0],values->data[1],
353386
values->data[2],values->data[3],
@@ -363,6 +396,8 @@ fmgr_c(FmgrInfo *finfo,
363396
values->data[22],values->data[23],
364397
values->data[24],values->data[25]);
365398
break;
399+
#endif
400+
#ifFUNC_MAX_ARGS >=27
366401
case27:
367402
returnValue= (*user_fn) (values->data[0],values->data[1],
368403
values->data[2],values->data[3],
@@ -379,6 +414,8 @@ fmgr_c(FmgrInfo *finfo,
379414
values->data[24],values->data[25],
380415
values->data[26]);
381416
break;
417+
#endif
418+
#ifFUNC_MAX_ARGS >=28
382419
case28:
383420
returnValue= (*user_fn) (values->data[0],values->data[1],
384421
values->data[2],values->data[3],
@@ -395,6 +432,8 @@ fmgr_c(FmgrInfo *finfo,
395432
values->data[24],values->data[25],
396433
values->data[26],values->data[27]);
397434
break;
435+
#endif
436+
#ifFUNC_MAX_ARGS >=29
398437
case29:
399438
returnValue= (*user_fn) (values->data[0],values->data[1],
400439
values->data[2],values->data[3],
@@ -412,6 +451,8 @@ fmgr_c(FmgrInfo *finfo,
412451
values->data[26],values->data[27],
413452
values->data[28]);
414453
break;
454+
#endif
455+
#ifFUNC_MAX_ARGS >=30
415456
case30:
416457
returnValue= (*user_fn) (values->data[0],values->data[1],
417458
values->data[2],values->data[3],
@@ -429,6 +470,8 @@ fmgr_c(FmgrInfo *finfo,
429470
values->data[26],values->data[27],
430471
values->data[28],values->data[29]);
431472
break;
473+
#endif
474+
#ifFUNC_MAX_ARGS >=31
432475
case31:
433476
returnValue= (*user_fn) (values->data[0],values->data[1],
434477
values->data[2],values->data[3],
@@ -447,6 +490,8 @@ fmgr_c(FmgrInfo *finfo,
447490
values->data[28],values->data[29],
448491
values->data[30]);
449492
break;
493+
#endif
494+
#ifFUNC_MAX_ARGS >=32
450495
case32:
451496
returnValue= (*user_fn) (values->data[0],values->data[1],
452497
values->data[2],values->data[3],
@@ -465,6 +510,7 @@ fmgr_c(FmgrInfo *finfo,
465510
values->data[28],values->data[29],
466511
values->data[30],values->data[31]);
467512
break;
513+
#endif
468514
default:
469515
elog(ERROR,"fmgr_c: function %u: too many arguments (%d > %d)",
470516
finfo->fn_oid,n_arguments,FUNC_MAX_ARGS);

0 commit comments

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