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

Commitceeeaa6

Browse files
committed
Corrected some functions for v16
1 parent34430a5 commitceeeaa6

File tree

2 files changed

+20
-5
lines changed

2 files changed

+20
-5
lines changed

‎tests/cmocka/missing_basic.c

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,20 +24,29 @@ pfree(void *pointer)
2424

2525
void
2626
ExceptionalCondition(constchar*conditionName,
27+
#ifPG_VERSION_NUM<160000
2728
constchar*errorType,
29+
#endif
2830
constchar*fileName,
2931
intlineNumber)
3032
{
31-
if (!PointerIsValid(conditionName)||
32-
!PointerIsValid(fileName)||
33-
!PointerIsValid(errorType))
33+
if (!PointerIsValid(conditionName)|| !PointerIsValid(fileName)
34+
#ifPG_VERSION_NUM<160000
35+
|| !PointerIsValid(errorType)
36+
#endif
37+
)
3438
{
3539
printf("TRAP: ExceptionalCondition: bad arguments\n");
3640
}
3741
else
3842
{
3943
printf("TRAP: %s(\"%s\", File: \"%s\", Line: %d)\n",
40-
errorType,conditionName,
44+
#ifPG_VERSION_NUM<160000
45+
errorType,
46+
#else
47+
"",
48+
#endif
49+
conditionName,
4150
fileName,lineNumber);
4251

4352
}

‎tests/cmocka/missing_stringinfo.c

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,13 @@ appendStringInfoSpaces(StringInfo str, int count)
206206
* if necessary.
207207
*/
208208
void
209-
appendBinaryStringInfo(StringInfostr,constchar*data,intdatalen)
209+
appendBinaryStringInfo(StringInfostr,
210+
#ifPG_VERSION_NUM<160000
211+
constchar*data,
212+
#else
213+
constvoid*data,
214+
#endif
215+
intdatalen)
210216
{
211217
Assert(str!=NULL);
212218

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp