diff options
author | McCabe Maxsted | 2009-10-03 19:35:17 -0700 |
---|---|---|
committer | McCabe Maxsted | 2009-10-03 19:35:17 -0700 |
commit | 640d11fbd63858bf82fa7ae3affc24032da73258 (patch) | |
tree | 023aa56f3b8f940a2caa316c67153feea1bba6ed | |
parent | Fixed account label not showing up in profiles (diff) | |
download | meta-impy-640d11fbd63858bf82fa7ae3affc24032da73258.zip meta-impy-640d11fbd63858bf82fa7ae3affc24032da73258.tar.gz meta-impy-640d11fbd63858bf82fa7ae3affc24032da73258.tar.bz2 meta-impy-640d11fbd63858bf82fa7ae3affc24032da73258.tar.xz |
Fixed extern C issue in llmediaimplgstreamer.h for Windows
-rw-r--r-- | ChangeLog.txt | 5 | ||||
-rw-r--r-- | linden/indra/llmedia/llmediaimplgstreamer.h | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt index 8e0563a..3f4b3e7 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt | |||
@@ -1,5 +1,10 @@ | |||
1 | 2009-10-03 McCabe Maxsted <hakushakukun@gmail.com> | 1 | 2009-10-03 McCabe Maxsted <hakushakukun@gmail.com> |
2 | 2 | ||
3 | * Fixed extern C issue in llmediaimplgstreamer.h for Windows. | ||
4 | |||
5 | modified: linden/indra/llmedia/llmediaimplgstreamer.h | ||
6 | |||
7 | |||
3 | * Fixed account label not showing up in profiles. | 8 | * Fixed account label not showing up in profiles. |
4 | 9 | ||
5 | modified: linden/indra/newview/skins/default/xui/en-us/panel_avatar.xml | 10 | modified: linden/indra/newview/skins/default/xui/en-us/panel_avatar.xml |
diff --git a/linden/indra/llmedia/llmediaimplgstreamer.h b/linden/indra/llmedia/llmediaimplgstreamer.h index 51a8c37..8d2e756 100644 --- a/linden/indra/llmedia/llmediaimplgstreamer.h +++ b/linden/indra/llmedia/llmediaimplgstreamer.h | |||
@@ -40,12 +40,13 @@ | |||
40 | ///#if LL_GSTREAMER_ENABLED | 40 | ///#if LL_GSTREAMER_ENABLED |
41 | 41 | ||
42 | extern "C" { | 42 | extern "C" { |
43 | #include <stdio.h> | ||
44 | #include <gst/gst.h> | 43 | #include <gst/gst.h> |
44 | } | ||
45 | 45 | ||
46 | #include <stdio.h> | ||
46 | #include "apr_pools.h" | 47 | #include "apr_pools.h" |
47 | #include "apr_dso.h" | 48 | #include "apr_dso.h" |
48 | } | 49 | |
49 | 50 | ||
50 | #include "llmediaimplgstreamervidplug.h" | 51 | #include "llmediaimplgstreamervidplug.h" |
51 | #include "llgstplaythread.h" | 52 | #include "llgstplaythread.h" |