From b01c75cb423f07a3d3354f8bd62f265f80062b3b Mon Sep 17 00:00:00 2001
From: Adam Moss <moss@lindenlab.com>
Date: Thu, 16 Apr 2009 23:45:35 +0000
Subject: svn merge -r117314:117337
 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/mv13a-merge-1

QAR-1343 maint-viewer-13a+libcurlexploitfix-3-3 combo merge
---
 indra/newview/llfilepicker.h | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'indra/newview/llfilepicker.h')

diff --git a/indra/newview/llfilepicker.h b/indra/newview/llfilepicker.h
index 104e0df293..ab2455620f 100644
--- a/indra/newview/llfilepicker.h
+++ b/indra/newview/llfilepicker.h
@@ -59,6 +59,7 @@
 #include <commdlg.h>
 #endif
 
+extern "C" {
 // mostly for Linux, possible on others
 #if LL_GTK
 # include "gtk/gtk.h"
@@ -68,6 +69,7 @@
 #if LL_X11
 #include "SDL/SDL_syswm.h"
 #endif
+}
 
 class LLFilePicker
 {
-- 
cgit v1.2.3