Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(841)

Unified Diff: config/config.h

Issue 2344973002: Update libsrtp to version 2.0 (Closed)
Patch Set: Add '.' back to include_dirs Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « VERSION ('k') | crypto/cipher/aes_gcm_ossl.c » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: config/config.h
diff --git a/config/config.h b/config/config.h
index df281fec2106f3e0653d036a14876cb9a3b19220..a078c77ef4a6f752155888747aca27f1441fd9c8 100644
--- a/config/config.h
+++ b/config/config.h
@@ -1,14 +1,13 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
+/*
+ * Copyright (c) 2016 The Chromium Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
-// This is a stub config.h for libSRTP. It doesn't define anything besides
-// version number strings because the build is configured by libsrtp.gyp.
-
-#define PACKAGE_STRING "libsrtp 1.5.0"
-#define PACKAGE_VERSION "1.5.0"
-
-#if defined(_MSC_VER) && !defined(__cplusplus)
- // Microsoft provides "inline" only for C++ code
- #define inline __inline
-#endif
+/*
+ * This space intentionally left blank.
+ *
+ * All of the #defines have been moved to BUILD.gn. The libsrtp headers
+ * equate "building as a library" with HAS_CONFIG_H, so we need to leave that
+ * defined and this file needs to be here.
+ */
« no previous file with comments | « VERSION ('k') | crypto/cipher/aes_gcm_ossl.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698