IMP-692: SNOW-713: Global objects in libllcommon duplicated in plugins

See http://jira.secondlife.com/browse/SNOW-713

This patch makes llcommon shared. It contains the following snowglobe
(SVN) changesets: 3478, 3479, 3480, 3481, 3482, 3485, 3496, 3498, 3500,
3519 and 3531, plus the fix for all rejects. Note that changes
to scripts/automated_build_scripts/opensrc-build.sh (changesets 3500
and 3625) were ignored as we don't have scripts/automated_build_scripts.

6 files changed, 10 insertions, 50 deletions

diff --git a/linden/indra/media_plugins/base/CMakeLists.txt b/linden/indra/media_plugins/base/CMakeLists.txt
index dd0b0a0..8d62043 100644
--- a/linden/indra/media_plugins/base/CMakeLists.txt
+++ b/linden/indra/media_plugins/base/CMakeLists.txt
@@ -2,10 +2,6 @@
 
 project(media_plugin_base)
 
-if(HAVE_64_BIT)
-        set(REQUIRE_PIC)
-endif(HAVE_64_BIT)
- 
 include(00-Common)
 include(LLCommon)
 include(LLImage)
diff --git a/linden/indra/media_plugins/example/CMakeLists.txt b/linden/indra/media_plugins/example/CMakeLists.txt
index bac5fa2..7822300 100644
--- a/linden/indra/media_plugins/example/CMakeLists.txt
+++ b/linden/indra/media_plugins/example/CMakeLists.txt
@@ -2,10 +2,6 @@
 
 project(media_plugin_example)
 
-if(HAVE_64_BIT)
-        set(REQUIRE_PIC)
-endif(HAVE_64_BIT)
-
 include(00-Common)
 include(LLCommon)
 include(LLImage)
diff --git a/linden/indra/media_plugins/gstreamer010/CMakeLists.txt b/linden/indra/media_plugins/gstreamer010/CMakeLists.txt
index a031157..4401e64 100644
--- a/linden/indra/media_plugins/gstreamer010/CMakeLists.txt
+++ b/linden/indra/media_plugins/gstreamer010/CMakeLists.txt
@@ -2,10 +2,6 @@
 
 project(media_plugin_gstreamer010)
 
-if(HAVE_64_BIT)
-        set(REQUIRE_PIC)
-endif(HAVE_64_BIT)
-
 include(00-Common)
 include(LLCommon)
 include(LLImage)
@@ -34,14 +30,6 @@ include_directories(
 
 ### media_plugin_gstreamer010
 
-if(NOT CMAKE_SIZEOF_VOID_P MATCHES 4)
-        if(WINDOWS)
-                add_definitions(/FIXED:NO)
-        else(WINDOWS) # not windows therefore gcc LINUX and DARWIN
-                add_definitions(-fPIC)
-        endif(WINDOWS)
-endif (NOT CMAKE_SIZEOF_VOID_P MATCHES 4)
-
 set(media_plugin_gstreamer010_SOURCE_FILES
     media_plugin_gstreamer010.cpp
     llmediaimplgstreamervidplug.cpp
diff --git a/linden/indra/media_plugins/gstreamer010/llmediaimplgstreamertriviallogging.h b/linden/indra/media_plugins/gstreamer010/llmediaimplgstreamertriviallogging.h
index 0ea096a..bb90aa1 100755
--- a/linden/indra/media_plugins/gstreamer010/llmediaimplgstreamertriviallogging.h
+++ b/linden/indra/media_plugins/gstreamer010/llmediaimplgstreamertriviallogging.h
@@ -38,31 +38,23 @@
 
 #include <cstdio>
 
-extern "C" {
-#include <sys/types.h>
-//#include <unistd.h> //fiuxme
-}
-
-#define MSGMODULEFOO "(media plugin)"
-
-#ifdef LL_LINUX
 /////////////////////////////////////////////////////////////////////////
 // Debug/Info/Warning macros.
-
-#define STDERRMSG(...) do{\
-    fprintf(stderr, " pid:%d: ", (int)getpid());\
-    fprintf(stderr, MSGMODULEFOO " %s:%d: ", __FUNCTION__, __LINE__);\
-    fprintf(stderr, __VA_ARGS__);\
-    fputc('\n',stderr);\
-  }while(0)
+#if LL_WINDOWS
+#include <process.h>
+#define LL_GETPID GetCurrentProcessId
 #else
+#include <sys/types.h>
+#include <unistd.h>
+#define LL_GETPID getpid
+#endif
+#define MSGMODULEFOO "(media plugin)"
 #define STDERRMSG(...) do{\
+    fprintf(stderr, " pid:%d: ", (int)LL_GETPID());\
     fprintf(stderr, MSGMODULEFOO " %s:%d: ", __FUNCTION__, __LINE__);\
     fprintf(stderr, __VA_ARGS__);\
     fputc('\n',stderr);\
   }while(0)
-#endif
-
 #define NULLMSG(...) do{}while(0)
 
 #define DEBUGMSG NULLMSG
diff --git a/linden/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp b/linden/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp
index 44bc32e..78e46ca 100755
--- a/linden/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp
+++ b/linden/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp
@@ -175,7 +175,7 @@ MediaPluginGStreamer010::MediaPluginGStreamer010(
         mCommand ( COMMAND_NONE )
 {
         std::ostringstream str;
-        INFOMSG("MediaPluginGStreamer010 constructor - my PID=%u", U32(getpid()));
+        INFOMSG("MediaPluginGStreamer010 constructor - my PID=%u", U32(LL_GETPID()));
 }
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/linden/indra/media_plugins/webkit/CMakeLists.txt b/linden/indra/media_plugins/webkit/CMakeLists.txt
index 2ab4a95..303a774 100644
--- a/linden/indra/media_plugins/webkit/CMakeLists.txt
+++ b/linden/indra/media_plugins/webkit/CMakeLists.txt
@@ -2,10 +2,6 @@
 
 project(media_plugin_webkit)
 
-if(HAVE_64_BIT)
-        set(REQUIRE_PIC)
-endif(HAVE_64_BIT)
-
 include(00-Common)
 include(LLCommon)
 include(LLImage)
@@ -34,20 +30,12 @@ include_directories(
     ${LLQTWEBKIT_INCLUDE_DIR}
 )
 
-
 ### media_plugin_webkit
 
 set(media_plugin_webkit_SOURCE_FILES
     media_plugin_webkit.cpp
     )
 
-if(NOT CMAKE_SIZEOF_VOID_P MATCHES 4)
-        if(WINDOWS)
-                add_definitions(/FIXED:NO)
-        else(WINDOWS) # not windows therefore gcc LINUX and DARWIN
-                add_definitions(-fPIC)
-        endif(WINDOWS)
-endif (NOT CMAKE_SIZEOF_VOID_P MATCHES 4)
 set(media_plugin_webkit_HEADER_FILES
     volume_catcher.h
     )