You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ac...@apache.org on 2016/11/25 21:01:42 UTC
[46/48] qpid-proton git commit: PROTON-1356: remove un-necessary
codec_shim.h
PROTON-1356: remove un-necessary codec_shim.h
PROTON-1356 reports problems with `go get`, with an error in types.go line 33,
pn_types_t not recognized. Not clear if this solves the problem, but types.go
was depending on a codec_shim.h file in the go package, which should have
included the pn_types_t definition. This shim is no longer needed and has been
removed.
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/2bcfd36f
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/2bcfd36f
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/2bcfd36f
Branch: refs/heads/go1
Commit: 2bcfd36f7a3a2eee523ad718c5a33f964b84dc6f
Parents: 451b3b4
Author: Alan Conway <ac...@redhat.com>
Authored: Fri Nov 25 15:09:42 2016 -0500
Committer: Alan Conway <ac...@redhat.com>
Committed: Fri Nov 25 15:09:42 2016 -0500
----------------------------------------------------------------------
.../go/src/qpid.apache.org/amqp/codec_shim.h | 33 --------------------
.../go/src/qpid.apache.org/amqp/marshal.go | 2 +-
.../go/src/qpid.apache.org/amqp/message.go | 2 +-
.../go/src/qpid.apache.org/amqp/types.go | 2 +-
.../go/src/qpid.apache.org/amqp/unmarshal.go | 2 +-
5 files changed, 4 insertions(+), 37 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/2bcfd36f/proton-c/bindings/go/src/qpid.apache.org/amqp/codec_shim.h
----------------------------------------------------------------------
diff --git a/proton-c/bindings/go/src/qpid.apache.org/amqp/codec_shim.h b/proton-c/bindings/go/src/qpid.apache.org/amqp/codec_shim.h
deleted file mode 100644
index b2f9f1c..0000000
--- a/proton-c/bindings/go/src/qpid.apache.org/amqp/codec_shim.h
+++ /dev/null
@@ -1,33 +0,0 @@
-#ifndef CODEC_SHIM_H
-#define CODEC_SHIM_H
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/** Stubs to allow the go binding to work with multiple versions of proton. */
-
-#include <proton/codec.h>
-#include <proton/version.h>
-
-#if PN_VERSION_MAJOR == 0 && PN_VERSION_MINOR <= 10
-
-#define PN_INVALID ((pn_type_t)-1)
-
-#endif
-
-#endif // CODEC_SHIM_H
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/2bcfd36f/proton-c/bindings/go/src/qpid.apache.org/amqp/marshal.go
----------------------------------------------------------------------
diff --git a/proton-c/bindings/go/src/qpid.apache.org/amqp/marshal.go b/proton-c/bindings/go/src/qpid.apache.org/amqp/marshal.go
index 3b4a59e..bce7323 100644
--- a/proton-c/bindings/go/src/qpid.apache.org/amqp/marshal.go
+++ b/proton-c/bindings/go/src/qpid.apache.org/amqp/marshal.go
@@ -19,7 +19,7 @@ under the License.
package amqp
-//#include "codec_shim.h"
+// #include <proton/codec.h>
import "C"
import (
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/2bcfd36f/proton-c/bindings/go/src/qpid.apache.org/amqp/message.go
----------------------------------------------------------------------
diff --git a/proton-c/bindings/go/src/qpid.apache.org/amqp/message.go b/proton-c/bindings/go/src/qpid.apache.org/amqp/message.go
index 48a209a..753682e 100644
--- a/proton-c/bindings/go/src/qpid.apache.org/amqp/message.go
+++ b/proton-c/bindings/go/src/qpid.apache.org/amqp/message.go
@@ -19,7 +19,7 @@ under the License.
package amqp
-// #include "codec_shim.h"
+// #include <proton/codec.h>
// #include <proton/types.h>
// #include <proton/message.h>
// #include <stdlib.h>
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/2bcfd36f/proton-c/bindings/go/src/qpid.apache.org/amqp/types.go
----------------------------------------------------------------------
diff --git a/proton-c/bindings/go/src/qpid.apache.org/amqp/types.go b/proton-c/bindings/go/src/qpid.apache.org/amqp/types.go
index d927cc5..bc0859a 100644
--- a/proton-c/bindings/go/src/qpid.apache.org/amqp/types.go
+++ b/proton-c/bindings/go/src/qpid.apache.org/amqp/types.go
@@ -19,7 +19,7 @@ under the License.
package amqp
-//#include "codec_shim.h"
+// #include <proton/codec.h>
import "C"
import (
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/2bcfd36f/proton-c/bindings/go/src/qpid.apache.org/amqp/unmarshal.go
----------------------------------------------------------------------
diff --git a/proton-c/bindings/go/src/qpid.apache.org/amqp/unmarshal.go b/proton-c/bindings/go/src/qpid.apache.org/amqp/unmarshal.go
index 6942174..95d4343 100644
--- a/proton-c/bindings/go/src/qpid.apache.org/amqp/unmarshal.go
+++ b/proton-c/bindings/go/src/qpid.apache.org/amqp/unmarshal.go
@@ -19,7 +19,7 @@ under the License.
package amqp
-// #include "codec_shim.h"
+// #include <proton/codec.h>
import "C"
import (
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org