Skip to content

Commit becd2a8

Browse files
committed
syscall: convert Windows AddrinfoW.Addr from uintptr to syscall.Pointer
API compatibility violation, but it wasn't safe before and people should be using golang.org/x/sys/windows instead. Fixes #24820 Change-Id: I3b43493f56b3116924b9d848a294899279f314fd Reviewed-on: https://go-review.googlesource.com/123455 Run-TryBot: Brad Fitzpatrick <[email protected]> Reviewed-by: Austin Clements <[email protected]> Reviewed-by: Ian Lance Taylor <[email protected]> TryBot-Result: Gobot Gobot <[email protected]>
1 parent c19f86f commit becd2a8

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

api/except.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -362,17 +362,19 @@ pkg syscall (openbsd-386-cgo), const SYS_KILL = 37
362362
pkg syscall (openbsd-amd64), const SYS_KILL = 37
363363
pkg syscall (openbsd-amd64-cgo), const SYS_KILL = 37
364364
pkg unicode, const Version = "9.0.0"
365+
pkg syscall (windows-386), const TOKEN_ALL_ACCESS = 983295
366+
pkg syscall (windows-386), type AddrinfoW struct, Addr uintptr
365367
pkg syscall (windows-386), type CertChainPolicyPara struct, ExtraPolicyPara uintptr
366368
pkg syscall (windows-386), type CertChainPolicyStatus struct, ExtraPolicyStatus uintptr
367369
pkg syscall (windows-386), type CertContext struct, CertInfo uintptr
368370
pkg syscall (windows-386), type CertRevocationInfo struct, CrlInfo uintptr
369371
pkg syscall (windows-386), type CertRevocationInfo struct, OidSpecificInfo uintptr
370372
pkg syscall (windows-386), type CertSimpleChain struct, TrustListInfo uintptr
371-
pkg syscall (windows-386), const TOKEN_ALL_ACCESS = 983295
373+
pkg syscall (windows-amd64), const TOKEN_ALL_ACCESS = 983295
374+
pkg syscall (windows-amd64), type AddrinfoW struct, Addr uintptr
372375
pkg syscall (windows-amd64), type CertChainPolicyPara struct, ExtraPolicyPara uintptr
373376
pkg syscall (windows-amd64), type CertChainPolicyStatus struct, ExtraPolicyStatus uintptr
374377
pkg syscall (windows-amd64), type CertContext struct, CertInfo uintptr
375378
pkg syscall (windows-amd64), type CertRevocationInfo struct, CrlInfo uintptr
376379
pkg syscall (windows-amd64), type CertRevocationInfo struct, OidSpecificInfo uintptr
377380
pkg syscall (windows-amd64), type CertSimpleChain struct, TrustListInfo uintptr
378-
pkg syscall (windows-amd64), const TOKEN_ALL_ACCESS = 983295

api/go1.11.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -529,6 +529,7 @@ pkg syscall (openbsd-amd64-cgo), func Pipe2([]int, int) error
529529
pkg syscall (windows-386), const TOKEN_ADJUST_SESSIONID = 256
530530
pkg syscall (windows-386), const TOKEN_ADJUST_SESSIONID ideal-int
531531
pkg syscall (windows-386), const TOKEN_ALL_ACCESS = 983551
532+
pkg syscall (windows-386), type AddrinfoW struct, Addr Pointer
532533
pkg syscall (windows-386), type CertChainPolicyPara struct, ExtraPolicyPara Pointer
533534
pkg syscall (windows-386), type CertChainPolicyStatus struct, ExtraPolicyStatus Pointer
534535
pkg syscall (windows-386), type CertContext struct, CertInfo *CertInfo
@@ -542,6 +543,7 @@ pkg syscall (windows-386), type Pointer *struct
542543
pkg syscall (windows-amd64), const TOKEN_ADJUST_SESSIONID = 256
543544
pkg syscall (windows-amd64), const TOKEN_ADJUST_SESSIONID ideal-int
544545
pkg syscall (windows-amd64), const TOKEN_ALL_ACCESS = 983551
546+
pkg syscall (windows-amd64), type AddrinfoW struct, Addr Pointer
545547
pkg syscall (windows-amd64), type CertChainPolicyPara struct, ExtraPolicyPara Pointer
546548
pkg syscall (windows-amd64), type CertChainPolicyStatus struct, ExtraPolicyStatus Pointer
547549
pkg syscall (windows-amd64), type CertContext struct, CertInfo *CertInfo

src/syscall/types_windows.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1009,7 +1009,7 @@ type AddrinfoW struct {
10091009
Protocol int32
10101010
Addrlen uintptr
10111011
Canonname *uint16
1012-
Addr uintptr
1012+
Addr Pointer
10131013
Next *AddrinfoW
10141014
}
10151015

0 commit comments

Comments
 (0)