diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2014-01-07 15:40:53 -0800 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2014-01-07 15:40:53 -0800 |
| commit | 0b3416a1dcd808fb71043a9f400f3ef2aa636abc (patch) | |
| tree | 9a7ff926af193e432f5646afbcfb2c7365b17879 /src/struct_info.json | |
| parent | 6fee37fceb9e06a805c8074aa68bf678f406ff5b (diff) | |
| parent | e4e8063f6d568277b297f19d51801cd7dda9545c (diff) | |
Merge branch 'incoming' into llvm-3.41.8.6
Conflicts:
tests/test_benchmark.py
tools/shared.py
Diffstat (limited to 'src/struct_info.json')
| -rw-r--r-- | src/struct_info.json | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/struct_info.json b/src/struct_info.json index c136cc8b..a22851b6 100644 --- a/src/struct_info.json +++ b/src/struct_info.json @@ -1061,5 +1061,17 @@ "patch" ] } + }, + { + "file": "uuid/uuid.h", + "defines": [ + "UUID_VARIANT_NCS", + "UUID_VARIANT_DCE", + "UUID_VARIANT_MICROSOFT", + "UUID_VARIANT_OTHER", + "UUID_TYPE_DCE_TIME", + "UUID_TYPE_DCE_RANDOM" + ], + "structs": {} } ] |