8000 Revert "Disable inline version of conflicting function as workaround" · postgres/postgres@794132c · GitHub
[go: up one dir, main page]
Skip to content
{"payload":{"commit":{"oid":"794132c2dacecbae1e3202b511f76b97ef708702","url":"/postgres/postgres/commit/794132c2dacecbae1e3202b511f76b97ef708702","authoredDate":"2014-01-06T02:33:24.000-05:00","committedDate":"2014-01-06T02:33:24.000-05:00","shortMessage":null,"shortMessageMarkdown":"\u003cdiv\u003eRevert \"Disable inline version of conflicting function as workaround\"\u003c/div\u003e","shortMessageMarkdownLink":null,"bodyMessageHtml":"This reverts commit \u003ca class=\"commit-link\" data-hovercard-type=\"commit\" data-hovercard-url=\"https://github.com/postgres/postgres/commit/fb83d0373224eccf6fe00b540a04102ee1f12617/hovercard\" href=\"https://github.com/postgres/postgres/commit/fb83d0373224eccf6fe00b540a04102ee1f12617\"\u003e\u003ctt\u003efb83d03\u003c/tt\u003e\u003c/a\u003e.","authors":[{"login":"danielcode","displayName":"srcdaniel","avatarUrl":"https://avatars.githubusercontent.com/u/1699355?v=4","path":"/danielcode","isGitHub":false}],"committerAttribution":false,"committer":{"login":"danielcode","displayName":"srcdaniel","avatarUrl":"https://avatars.githubusercontent.com/u/1699355?v=4","path":"/danielcode","isGitHub":false},"pusher":null,"pushedDate":null,"parents":["1133b4ca8ae168dd996c351bf5c15911705b5e16"],"globalRelayId":"MDY6Q29tbWl0OTI3NDQyOjc5NDEzMmMyZGFjZWNiYWUxZTMyMDJiNTExZjc2Yjk3ZWY3MDg3MDI=","sha1":"1133b4ca8ae168dd996c351bf5c15911705b5e16","sha2":"794132c2dacecbae1e3202b511f76b97ef708702"},"currentUser":null,"repo":{"id":927442,"defaultBranch":"master","name":"postgres","ownerLogin":"postgres","currentUserCanPush":false,"isFork":false,"isEmpty":false,"createdAt":"2010-09-21T11:35:45.000Z","ownerAvatar":"https://avatars.githubusercontent.com/u/177543?v=4","public":true,"private":false,"isOrgOwned":true},"diffEntryData":[{"diffLines":[{"stylingDirective":null,"type":"HUNK","blobLineNumber":780,"text":"@@ -781,7 +781,7 @@ extern uint32 ginMergeItemPointers(ItemPointerData *dst,","html":"@@ -781,7 +781,7 @@ extern uint32 ginMergeItemPointers(ItemPointerData *dst,","displayNoNewLineWarning":false,"position":0,"left":780,"right":780},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":781,"text":" * fall back on the non-inline version from itemptr.c. See STATIC_IF_INLINE in","html":" \u003cspan class=pl-c\u003e * fall back on the non-inline version from itemptr.c. See STATIC_IF_INLINE in\u003c/span\u003e","displayNoNewLineWarning":false,"position":1,"left":781,"right":781},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":782,"text":" * c.h.","html":" \u003cspan class=pl-c\u003e * c.h.\u003c/span\u003e","displayNoNewLineWarning":false,"position":2,"left":782,"right":782},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":783,"text":" */","html":" \u003cspan class=pl-c\u003e */\u003c/span\u003e","displayNoNewLineWarning":false,"position":3,"left":783,"right":783},{"stylingDirective":null,"type":"DELETION","blobLineNumber":784,"text":"-#ifndef PG_USE_INLINE","html":"-\u003cspan class=\"pl-k\"\u003e#\u003cspan class=\"x x-first x-last\"\u003eifndef\u003c/span\u003e\u003c/span\u003e \u003cspan class=\"pl-c1\"\u003ePG_USE_INLINE\u003c/span\u003e","displayNoNewLineWarning":false,"position":4,"left":784,"right":783},{"stylingDirective":null,"type":"ADDITION","blobLineNumber":784,"text":"+#ifdef PG_USE_INLINE","html":"+\u003cspan class=\"pl-k\"\u003e#\u003cspan class=\"x x-first x-last\"\u003eifdef\u003c/span\u003e\u003c/span\u003e \u003cspan class=\"pl-c1\"\u003ePG_USE_INLINE\u003c/span\u003e","displayNoNewLineWarning":false,"position":5,"left":784,"right":784},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":785,"text":" static inline int","html":" \u003cspan class=pl-k\u003estatic\u003c/span\u003e \u003cspan class=pl-k\u003einline\u003c/span\u003e \u003cspan class=pl-smi\u003eint\u003c/span\u003e","displayNoNewLineWarning":false,"position":6,"left":785,"right":785},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":786,"text":" ginCompareItemPointers(ItemPointer a, ItemPointer b)","html":" \u003cspan class=pl-en\u003eginCompareItemPointers\u003c/span\u003e(\u003cspan class=pl-smi\u003eItemPointer\u003c/span\u003e \u003cspan class=pl-s1\u003ea\u003c/span\u003e, \u003cspan class=pl-smi\u003eItemPointer\u003c/span\u003e \u003cspan class=pl-s1\u003eb\u003c/span\u003e)","displayNoNewLineWarning":false,"position":7,"left":786,"right":786},{"stylingDirective":null,"type":"CONTEXT","blobLineNumber":787,"text":" {","html":" {","displayNoNewLineWarning":false,"position":8,"left":787,"right":787}],"diffNumber":0,"diffSize":"0 Bytes","isBinary":false,"isTooBig":false,"collapsed":false,"isSubmodule":false,"lineCount":802,"linesChanged":2,"newTreeEntry":{"lineCount":802,"path":"src/include/access/gin_private.h","mode":100644,"isGenerated":false},"oldTreeEntry":{"lineCount":0,"path":"src/include/access/gin_private.h","mode":100644},"linesAdded":1,"linesDeleted":1,"path":"src/include/access/gin_private.h","pathDigest":"153019ad7d321f56d7419c47b2b2ae8ec1c29e422b51e0ec2b1e0b91d99bc2ce","status":"MODIFIED","truncatedReason":null,"oldOid":"1133b4ca8ae168dd996c351bf5c15911705b5e16","newOid":"794132c2dacecbae1e3202b511f76b97ef708702","copilotChatReference":null,"deletedSha":"1133b4ca8ae168dd996c351bf5c15911705b5e16","canToggleRichDiff":false,"defaultToRichDiff":false,"proseDifffHtml":null,"renderInfo":null,"dependencyDiffPath":null,"submodule":null}],"splitViewPreference":"unified","ignoreWhitespace":false,"repoOwnerGlobalRelayId":"MDEyOk9yZ2FuaXphdGlvbjE3NzU0Mw==","commentsPreference":"visible","diffLineSpacingPreference":"relaxed","useMonospaceFont":false,"pasteUrlLinkAsPlainText":false,"userNotices":[],"path":"/postgres/postgres/commit/794132c2dacecbae1e3202b511f76b97ef708702","fileTreeExpanded":true,"headerInfo":{"additions":1,"deletions":1,"filesChanged":1,"filesChangedString":"1"},"moreDiffsToLoad":false,"asyncDiffLoadInfo":{"startIndex":1,"truncated":false,"byteCount":291,"lineShownCount":9},"commentInfo":{"canComment":false,"locked":false,"canLock":false,"repoArchived":false},"csrf_tokens":{"/users/diffview?diff=split":{"post":"RIduPeD-YJl0GRMgwV3Ekfm-vVnBlOl4I6EafRfCMZ1ND-1ZDLmBvOXwYSIcqa2Iw3W8pj_GWmosYcXMo_mhkA"},"/users/diffview?diff=unified":{"post":"2rpD-uVvVl6G_EYuV_IxWTAfmxcwoRN5sqjOvAGSr1TTMsCeCSi3excVNCyKBlhACtSa6M7zoGu9aBENtak_WQ"},"/notifications/thread":{"post":"GiSPLJxyBY75_WDjk2Wj3j_SOMzWrPCTPHbgmmX_wd-XgDh2mSE8UNfTpkex3Q7VEhEZ7rBKvB1k-eQ6IAP3DA"}}},"title":"Revert \"Disable inline version of conflicting function as workaround\" · postgres/postgres@794132c","appPayload":{"helpUrl":"https://docs.github.com","findInDiffWorkerPath":"/assets-cdn/worker/find-in-diff-worker-2bfe39677d14.js","enabled_features":{"diff_ux_refresh_beta":false,"diff_inline_comments":true,"show_pusher_on_commit_detail":false}}}

Commit 794132c

Browse files
danielcodedanielcode
committed
Revert "Disable inline version of conflicting function as workaround"
This reverts commit fb83d03.
1 parent 1133b4c commit 794132c

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

‎src/include/access/gin_private.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -781,7 +781,7 @@ extern uint32 ginMergeItemPointers(ItemPointerData *dst,
781781
* fall back on the non-inline version from itemptr.c. See STATIC_IF_INLINE in
782782
* c.h.
783783
*/
784-
#ifndef PG_USE_INLINE
784+
#ifdef PG_USE_INLINE
785785
static inline int
786786
ginCompareItemPointers(ItemPointer a, ItemPointer b)
787787
{

0 commit comments

Comments
 (0)
0