diff options
author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2010-10-10 02:30:01 +0400 |
---|---|---|
committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2010-10-10 02:30:01 +0400 |
commit | d7cd6e349d01f6be60649a013c22330f0ba34c54 (patch) | |
tree | caa99d6a9c1acc076cdf5c570ef8a67c24bd0880 /source/blender/blenkernel/BKE_main.h | |
parent | 854ef1770075c6e1579ccbbd30eda57484527760 (diff) | |
parent | d420d09da982e1a874ffe2b0612b8fdd0afc980e (diff) |
Merged changes in the trunk up to revision 32390.
Diffstat (limited to 'source/blender/blenkernel/BKE_main.h')
-rw-r--r-- | source/blender/blenkernel/BKE_main.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/source/blender/blenkernel/BKE_main.h b/source/blender/blenkernel/BKE_main.h index 74d4d114eba..3de2893fb56 100644 --- a/source/blender/blenkernel/BKE_main.h +++ b/source/blender/blenkernel/BKE_main.h @@ -40,6 +40,10 @@ #include "DNA_listBase.h" +#ifdef __cplusplus +extern "C" { +#endif + struct Library; typedef struct Main { @@ -81,5 +85,9 @@ typedef struct Main { } Main; +#ifdef __cplusplus +} +#endif + #endif |