diff options
| author | ahendrickson@google.com <ahendrickson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-10 17:28:05 +0000 |
|---|---|---|
| committer | ahendrickson@google.com <ahendrickson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-10 17:28:05 +0000 |
| commit | 20737699af37ed66f628e5222962c118d6a06175 (patch) | |
| tree | 46df315823ad31eb7a5daa826e9f2b03485cbb24 /net/third_party | |
| parent | 390433fb12f15cd57ec871f54ebe0a7fc1fc08fe (diff) | |
| download | chromium_src-20737699af37ed66f628e5222962c118d6a06175.zip chromium_src-20737699af37ed66f628e5222962c118d6a06175.tar.gz chromium_src-20737699af37ed66f628e5222962c118d6a06175.tar.bz2 | |
Removed gssapi namespace.
BUG=33033.
TEST=None.
Review URL: http://codereview.chromium.org/2682006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49414 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/third_party')
| -rw-r--r-- | net/third_party/gssapi/README.chromium | 4 | ||||
| -rw-r--r-- | net/third_party/gssapi/gssapi.h | 24 |
2 files changed, 8 insertions, 20 deletions
diff --git a/net/third_party/gssapi/README.chromium b/net/third_party/gssapi/README.chromium index 4777ff3..5261c72 100644 --- a/net/third_party/gssapi/README.chromium +++ b/net/third_party/gssapi/README.chromium @@ -13,8 +13,6 @@ on 11 May 2010. The LICENSE from the header has been copied here. Local Modifications: -There are no local changes to the code itself, other than a -namespace change. Please note that our local changes are -marked with the "BEGIN GOOGLE MODIFICATIONS" comments. +There are no local changes to the code itself. A gssapi.gyp file has been added for building with Chromium. diff --git a/net/third_party/gssapi/gssapi.h b/net/third_party/gssapi/gssapi.h index 8558b6d..45e5020 100644 --- a/net/third_party/gssapi/gssapi.h +++ b/net/third_party/gssapi/gssapi.h @@ -95,10 +95,6 @@ #endif #endif -// BEGIN GOOGLE MODIFICATIONS -namespace gssapi { -// END GOOGLE MODIFICATIONS - EXTERN_C_BEGIN /* @@ -241,16 +237,14 @@ typedef struct gss_channel_bindings_struct { /* * Various Null values */ -// BEGIN GOOGLE MODIFICATIONS -#define GSS_C_NO_NAME ((gssapi::gss_name_t) 0) -#define GSS_C_NO_BUFFER ((gssapi::gss_buffer_t) 0) -#define GSS_C_NO_OID ((gssapi::gss_OID) 0) -#define GSS_C_NO_OID_SET ((gssapi::gss_OID_set) 0) -#define GSS_C_NO_CONTEXT ((gssapi::gss_ctx_id_t) 0) -#define GSS_C_NO_CREDENTIAL ((gssapi::gss_cred_id_t) 0) -#define GSS_C_NO_CHANNEL_BINDINGS ((gssapi::gss_channel_bindings_t) 0) +#define GSS_C_NO_NAME ((gss_name_t) 0) +#define GSS_C_NO_BUFFER ((gss_buffer_t) 0) +#define GSS_C_NO_OID ((gss_OID) 0) +#define GSS_C_NO_OID_SET ((gss_OID_set) 0) +#define GSS_C_NO_CONTEXT ((gss_ctx_id_t) 0) +#define GSS_C_NO_CREDENTIAL ((gss_cred_id_t) 0) +#define GSS_C_NO_CHANNEL_BINDINGS ((gss_channel_bindings_t) 0) #define GSS_C_EMPTY_BUFFER {0, NULL} -// END GOOGLE MODIFICATIONS /* * Some alternate names for a couple of the above @@ -846,9 +840,5 @@ GSS_CALLCONV GSS_FUNC(gss_duplicate_name) EXTERN_C_END -// BEGIN GOOGLE MODIFICATIONS -} // namespace gssapi -// END GOOGLE MODIFICATIONS - #endif /* GSSAPI_H_ */ |