diff options
| author | Filippo Valsorda <filippo@golang.org> | 2018-07-02 17:50:42 -0400 |
|---|---|---|
| committer | Filippo Valsorda <filippo@golang.org> | 2018-07-02 22:36:31 +0000 |
| commit | 0bad1bef406e987b7b749efc3bb7ab5d08b36a1c (patch) | |
| tree | 34b9f97d1683622d58605928e4d75fb4df711ae5 /misc | |
| parent | 3959ce667657defe1c99984adde93ca496953765 (diff) | |
| parent | 7df09b4a03f9e53334672674ba7983d5e7128646 (diff) | |
| download | go-git-dev.boringcrypto.go1.9.tar.gz | |
[dev.boringcrypto.go1.9] all: merge go1.9.7 into dev.boringcrypto.go1.9dev.boringcrypto.go1.9
Change-Id: I1f9769a0c2c7c090886afa31c86c403da29d2013
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/cgo/testcshared/main2.c | 2 | ||||
| -rw-r--r-- | misc/cgo/testcshared/src/libgo2/libgo2.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/misc/cgo/testcshared/main2.c b/misc/cgo/testcshared/main2.c index 6e8bf141ca..1a3f1d7545 100644 --- a/misc/cgo/testcshared/main2.c +++ b/misc/cgo/testcshared/main2.c @@ -9,7 +9,7 @@ #include <time.h> #include <unistd.h> -#define fd (100) +#define fd (30) // Tests libgo2.so, which does not export any functions. // Read a string from the file descriptor and print it. diff --git a/misc/cgo/testcshared/src/libgo2/libgo2.go b/misc/cgo/testcshared/src/libgo2/libgo2.go index 1b69d8f09f..e57c93b77d 100644 --- a/misc/cgo/testcshared/src/libgo2/libgo2.go +++ b/misc/cgo/testcshared/src/libgo2/libgo2.go @@ -21,7 +21,7 @@ import ( // that the C code can also use. const ( - fd = 100 + fd = 30 ) func init() { |