Chromium Code Reviews| Index: src/third_party/vtune/LICENSE |
| diff --git a/src/third_party/vtune/ittnotify_types.h b/src/third_party/vtune/LICENSE |
| similarity index 57% |
| copy from src/third_party/vtune/ittnotify_types.h |
| copy to src/third_party/vtune/LICENSE |
| index 736c1f5b5ec4b9e9ff677f92fb04e0f2119eb2d1..671b90a3823422c3852b2da026d6cdc8b77b2b2a 100644 |
| --- a/src/third_party/vtune/ittnotify_types.h |
| +++ b/src/third_party/vtune/LICENSE |
| @@ -1,10 +1,12 @@ |
| +All files in this directory are provided by the following license if not stated |
| +otherwise in the individual file: |
| /* |
|
ulan
2015/06/16 10:55:49
Remove the comment?
Michael Hablich
2015/06/16 11:09:01
Done.
|
| This file is provided under a dual BSD/GPLv2 license. When using or |
| redistributing this file, you may do so under either license. |
| GPL LICENSE SUMMARY |
| - Copyright(c) 2005-2012 Intel Corporation. All rights reserved. |
| + Copyright (c) 2005-2012 Intel Corporation. All rights reserved. |
| This program is free software; you can redistribute it and/or modify |
| it under the terms of version 2 of the GNU General Public License as |
| @@ -26,7 +28,7 @@ |
| BSD LICENSE |
| - Copyright(c) 2005-2012 Intel Corporation. All rights reserved. |
| + Copyright (c) 2005-2012 Intel Corporation. All rights reserved. |
| All rights reserved. |
| Redistribution and use in source and binary forms, with or without |
| @@ -55,59 +57,3 @@ |
| (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| */ |
| -#ifndef _ITTNOTIFY_TYPES_H_ |
| -#define _ITTNOTIFY_TYPES_H_ |
| - |
| -typedef enum ___itt_group_id |
| -{ |
| - __itt_group_none = 0, |
| - __itt_group_legacy = 1<<0, |
| - __itt_group_control = 1<<1, |
| - __itt_group_thread = 1<<2, |
| - __itt_group_mark = 1<<3, |
| - __itt_group_sync = 1<<4, |
| - __itt_group_fsync = 1<<5, |
| - __itt_group_jit = 1<<6, |
| - __itt_group_model = 1<<7, |
| - __itt_group_splitter_min = 1<<7, |
| - __itt_group_counter = 1<<8, |
| - __itt_group_frame = 1<<9, |
| - __itt_group_stitch = 1<<10, |
| - __itt_group_heap = 1<<11, |
| - __itt_group_splitter_max = 1<<12, |
| - __itt_group_structure = 1<<12, |
| - __itt_group_suppress = 1<<13, |
| - __itt_group_all = -1 |
| -} __itt_group_id; |
| - |
| -#pragma pack(push, 8) |
| - |
| -typedef struct ___itt_group_list |
| -{ |
| - __itt_group_id id; |
| - const char* name; |
| -} __itt_group_list; |
| - |
| -#pragma pack(pop) |
| - |
| -#define ITT_GROUP_LIST(varname) \ |
| - static __itt_group_list varname[] = { \ |
| - { __itt_group_all, "all" }, \ |
| - { __itt_group_control, "control" }, \ |
| - { __itt_group_thread, "thread" }, \ |
| - { __itt_group_mark, "mark" }, \ |
| - { __itt_group_sync, "sync" }, \ |
| - { __itt_group_fsync, "fsync" }, \ |
| - { __itt_group_jit, "jit" }, \ |
| - { __itt_group_model, "model" }, \ |
| - { __itt_group_counter, "counter" }, \ |
| - { __itt_group_frame, "frame" }, \ |
| - { __itt_group_stitch, "stitch" }, \ |
| - { __itt_group_heap, "heap" }, \ |
| - { __itt_group_structure, "structure" }, \ |
| - { __itt_group_suppress, "suppress" }, \ |
| - { __itt_group_none, NULL } \ |
| - } |
| - |
| -#endif /* _ITTNOTIFY_TYPES_H_ */ |
| - |