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

Unified Diff: third_party/usrsctp/overrides/usrsctplib/netinet/sctp_os.h

Issue 23960004: Updated usrsctp to latest version with fixes upstream. Fixed usrsctp gyp file; removed overides. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: "updated to fix for mac building from upstream" Created 7 years, 3 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
Index: third_party/usrsctp/overrides/usrsctplib/netinet/sctp_os.h
diff --git a/third_party/usrsctp/overrides/usrsctplib/netinet/sctp_os.h b/third_party/usrsctp/overrides/usrsctplib/netinet/sctp_os.h
deleted file mode 100644
index a315f72fd266588feb8b6930e5d1460a94e9d6ef..0000000000000000000000000000000000000000
--- a/third_party/usrsctp/overrides/usrsctplib/netinet/sctp_os.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/*-
- * Copyright (c) 2006-2007, by Cisco Systems, Inc. All rights reserved.
- * Copyright (c) 2008-2012, by Randall Stewart. All rights reserved.
- * Copyright (c) 2008-2012, by Michael Tuexen. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * a) Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- *
- * b) Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the distribution.
- *
- * c) Neither the name of Cisco Systems, Inc. nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifdef __FreeBSD__
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/netinet/sctp_os.h 235828 2012-05-23 11:26:28Z tuexen $");
-#endif
-
-#ifndef _NETINET_SCTP_OS_H_
-#define _NETINET_SCTP_OS_H_
-
-/*
- * General kernel memory allocation:
- * SCTP_MALLOC(element, type, size, name)
- * SCTP_FREE(element)
- * Kernel memory allocation for "soname"- memory must be zeroed.
- * SCTP_MALLOC_SONAME(name, type, size)
- * SCTP_FREE_SONAME(name)
- */
-
-/*
- * Zone(pool) allocation routines: MUST be defined for each OS.
- * zone = zone/pool pointer.
- * name = string name of the zone/pool.
- * size = size of each zone/pool element.
- * number = number of elements in zone/pool.
- * type = structure type to allocate
- *
- * sctp_zone_t
- * SCTP_ZONE_INIT(zone, name, size, number)
- * SCTP_ZONE_GET(zone, type)
- * SCTP_ZONE_FREE(zone, element)
- * SCTP_ZONE_DESTROY(zone)
- */
-
-#if defined(__FreeBSD__)
-#include <netinet/sctp_os_bsd.h>
-#else
-#define MODULE_GLOBAL(_B) (_B)
-#endif
-
-#if defined(__Userspace__)
-#include <netinet/sctp_os_userspace.h>
-#endif
-
-#if defined(__APPLE__)
-#undef __APPLE__
-// #include <netinet/sctp_os_macosx.h>
-#endif
-
-#if defined(__Panda__)
-#include <ip/sctp/sctp_os_iox.h>
-#endif
-
-#if defined(__Windows__)
-#include <netinet/sctp_os_windows.h>
-#endif
-
-/* All os's must implement this address gatherer. If
- * no VRF's exist, then vrf 0 is the only one and all
- * addresses and ifn's live here.
- */
-#define SCTP_DEFAULT_VRF 0
-void sctp_init_vrf_list(int vrfid);
-
-#endif

Powered by Google App Engine
This is Rietveld 408576698