Changeset 37025 in vbox for trunk

Timestamp:

May 10, 2011 11:31:36 AM (14 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

71640

Message:

Additions/x11/VBoxClient: clean up some forgotton C++-isms and stop us linking with libstdc++

Location:

trunk

Files:

trunk/Config.kmk

-              r37018
+              r37025
+#
 # Template for building R3 programs for the guest additions.
-# Note: Make sure you don't break VBOXGUESTR3CPPEXE when changing this.
+#
 TEMPLATE_VBOXGUESTR3EXE           = VBox Guest Program
 …
         iconv
+#
-# Template for guest stuff that makes use of the C++ library and features.
-# (This is mostly about undoing what was done to C++ for VBOXGUESTR3EXE.)
+#
-TEMPLATE_VBOXGUESTR3CPPEXE           = VBox Guest Program with C++ library dependencies
-TEMPLATE_VBOXGUESTR3CPPEXE_EXTENDS   = VBOXGUESTR3EXE
-ifeq ($(KBUILD_TARGET),win)
- # later if necessary
-else
- TEMPLATE_VBOXGUESTR3CPPEXE_TOOL     = $(TEMPLATE_VBOXR3EXE_TOOL)
- TEMPLATE_VBOXGUESTR3CPPEXE_CXXFLAGS = $(TEMPLATE_VBOXR3EXE_CXXFLAGS)
-endif
+#

r36810	r37025
24	24	PROGRAMS += VBoxClient
25	25
26		VBoxClient_TEMPLATE = VBOXGUESTR3~~CPP~~EXE
	26	VBoxClient_TEMPLATE = VBOXGUESTR3EXE
27	27	VBoxClient_DEFS += VBOX_X11_CLIPBOARD VBOX_WITH_HGCM
28	28	ifdef VBOX_WITH_DBUS

-              r28800
+              r37025
         LogRelFlowFunc(("\n"));
         if (mInit)
+            try {
+                uninit(2000);
+            } catch (...) { }
+            uninit(2000);
         LogRelFlowFunc(("returning\n"));
+    }

-              r36806
+              r37025
+        {
             LogRel(("VBoxClient: seamless host object still running!  Stopping...\n"));
+            try
+            {
+                stop(2000);
+            }
+            catch(...) {}
+            stop(2000);
+        }
         LogRelFlowFunc(("returning\n"));

-              r36806
+              r37025
     ~VBoxGuestSeamlessX11()
+    {
+        try
+        {
+            uninit();
+        }
+        catch(...) {}
+        uninit();
         if (mDisplay)
             XCloseDisplay(mDisplay);

-              r36807
+              r37025
+    {
         LogRelThisFunc(("Warning!  Stopping thread %s, as it is still running!\n", mName));
+        try
+        {
+            stop(2000, 0);
+        }
+        catch(...) {}
+        stop(2000, 0);
+    }
     LogRelFlowFunc(("returning\n"));

Note: See TracChangeset for help on using the changeset viewer.