v23proxy: Upgrading to mojo 11 profile.
MultiPart: 3/3
Change-Id: Ibf7c15265e82001ba0aa7d0749af1edcb332fe78
diff --git a/go/src/examples/echo/server/echo_server.go b/go/src/examples/echo/server/echo_server.go
index 4cd4bab..c5ab66b 100644
--- a/go/src/examples/echo/server/echo_server.go
+++ b/go/src/examples/echo/server/echo_server.go
@@ -14,7 +14,7 @@
"mojom/examples/echo"
)
-//#include "mojo/public/c/system/types.h"
+//#include "mojo/public/c/system/handle.h"
import "C"
type RemoteEchoImpl struct{}
diff --git a/go/src/examples/fortune/client/fortune_client.go b/go/src/examples/fortune/client/fortune_client.go
index 3f17c79..f59d4d5 100644
--- a/go/src/examples/fortune/client/fortune_client.go
+++ b/go/src/examples/fortune/client/fortune_client.go
@@ -18,7 +18,7 @@
"mojom/examples/fortune"
)
-//#include "mojo/public/c/system/types.h"
+//#include "mojo/public/c/system/handle.h"
import "C"
type FortuneClientDelegate struct{}
diff --git a/go/src/examples/fortune/server/fortune_server.go b/go/src/examples/fortune/server/fortune_server.go
index e63f54d..9f892e5 100644
--- a/go/src/examples/fortune/server/fortune_server.go
+++ b/go/src/examples/fortune/server/fortune_server.go
@@ -16,7 +16,7 @@
"mojom/examples/fortune"
)
-//#include "mojo/public/c/system/types.h"
+//#include "mojo/public/c/system/handle.h"
import "C"
type FortuneImpl struct {
diff --git a/go/src/v.io/x/mojo/proxy/clientproxy/clientproxy.go b/go/src/v.io/x/mojo/proxy/clientproxy/clientproxy.go
index fb16bc8..97907e5 100644
--- a/go/src/v.io/x/mojo/proxy/clientproxy/clientproxy.go
+++ b/go/src/v.io/x/mojo/proxy/clientproxy/clientproxy.go
@@ -24,7 +24,7 @@
"v.io/x/ref/runtime/factories/roaming"
)
-//#include "mojo/public/c/system/types.h"
+//#include "mojo/public/c/system/handle.h"
import "C"
type v23HeaderReceiver struct {
diff --git a/go/src/v.io/x/mojo/proxy/serverproxy/serverproxy.go b/go/src/v.io/x/mojo/proxy/serverproxy/serverproxy.go
index e4e5658..25257a3 100644
--- a/go/src/v.io/x/mojo/proxy/serverproxy/serverproxy.go
+++ b/go/src/v.io/x/mojo/proxy/serverproxy/serverproxy.go
@@ -29,7 +29,7 @@
"v.io/x/ref/runtime/factories/roaming"
)
-//#include "mojo/public/c/system/types.h"
+//#include "mojo/public/c/system/handle.h"
import "C"
// As long as fakeService meets the Invoker interface, it is allowed to pass as
diff --git a/go/src/v.io/x/mojo/tests/client/test_client.go b/go/src/v.io/x/mojo/tests/client/test_client.go
index 7841083..afbcade 100644
--- a/go/src/v.io/x/mojo/tests/client/test_client.go
+++ b/go/src/v.io/x/mojo/tests/client/test_client.go
@@ -24,7 +24,7 @@
"v.io/x/mojo/tests/expected"
)
-//#include "mojo/public/c/system/types.h"
+//#include "mojo/public/c/system/handle.h"
import "C"
var (
diff --git a/go/src/v.io/x/mojo/tests/server/test_server.go b/go/src/v.io/x/mojo/tests/server/test_server.go
index 8fe8607..78b93f2 100644
--- a/go/src/v.io/x/mojo/tests/server/test_server.go
+++ b/go/src/v.io/x/mojo/tests/server/test_server.go
@@ -19,7 +19,7 @@
"v.io/x/mojo/tests/expected"
)
-//#include "mojo/public/c/system/types.h"
+//#include "mojo/public/c/system/handle.h"
import "C"
const noReturnReceiveTimeout = 1 * time.Second
diff --git a/go/src/v.io/x/mojo/transcoder/internal/internal.vdl.go b/go/src/v.io/x/mojo/transcoder/internal/internal.vdl.go
index 76b2812..77225a3 100644
--- a/go/src/v.io/x/mojo/transcoder/internal/internal.vdl.go
+++ b/go/src/v.io/x/mojo/transcoder/internal/internal.vdl.go
@@ -257,7 +257,7 @@
case "TransUnion":
*t.Value = 2
default:
- return fmt.Errorf("label %s not in enum CreditAgencyEquifax", src)
+ return fmt.Errorf("label %s not in enum CreditAgency", src)
}
return nil
@@ -341,7 +341,7 @@
case "Bad":
*t.Value = 1
default:
- return fmt.Errorf("label %s not in enum ExperianRatingGood", src)
+ return fmt.Errorf("label %s not in enum ExperianRating", src)
}
return nil
diff --git a/go/src/v.io/x/mojo/transcoder/testtypes/testtypes.vdl.go b/go/src/v.io/x/mojo/transcoder/testtypes/testtypes.vdl.go
index b74ab04..3836112 100644
--- a/go/src/v.io/x/mojo/transcoder/testtypes/testtypes.vdl.go
+++ b/go/src/v.io/x/mojo/transcoder/testtypes/testtypes.vdl.go
@@ -91,7 +91,7 @@
case "Second":
*t.Value = 1
default:
- return fmt.Errorf("label %s not in enum AnEnumFirst", src)
+ return fmt.Errorf("label %s not in enum AnEnum", src)
}
return nil
