Changeset 6459 in vbox for trunk/src/VBox/Additions/x11/xclient

Timestamp:

Jan 23, 2008 6:30:01 AM (17 years ago)

Author:

vboxsync

Message:

Additions (X11): renamed LINUX_SEAMLESS_GUEST to VBOX_X11_SEAMLESS_GUEST and SEAMLESS_LINUX to SEAMLESS_X11

Location:

trunk/src/VBox/Additions/x11/xclient

Files:

• Makefile.kmk (modified) (3 diffs)
• main.cpp (modified) (6 diffs)

trunk/src/VBox/Additions/x11/xclient/Makefile.kmk

@@ -30 +30 @@
 vboxadd-xclient_DEFS    += VBOX_X11_CLIPBOARD
 
-ifdef LINUX_SEAMLESS_GUEST
+ifdef VBOX_X11_SEAMLESS_GUEST
  vboxadd-xclient_SOURCES += \
                  seamless-host.cpp \
@@ -49 +49 @@
 vboxadd-xclient_DEFS    += _GNU_SOURCE VBOX_HGCM
 
-ifdef LINUX_SEAMLESS_GUEST
- vboxadd-xclient_DEFS     += SEAMLESS_LINUX
+ifdef VBOX_X11_SEAMLESS_GUEST
+ vboxadd-xclient_DEFS     += SEAMLESS_X11
 endif
 
@@ -60 +60 @@
         $(QUIET)ln -sf `$(TOOL_$(VBOX_GCC32_TOOL)_CXX) -print-file-name=libstdc++.a` $@ || cp `$(TOOL_$(VBOX_GCC32_TOOL)_CXX) -print-file-name=libstdc++.a` $@
 
-ifdef LINUX_SEAMLESS_GUEST
+ifdef VBOX_X11_SEAMLESS_GUEST
  ifdef VBOX_WITH_TESTCASES
  # Additional testcase designed to be run manually, which initiates and starts the Linux

trunk/src/VBox/Additions/x11/xclient/main.cpp

@@ -35 +35 @@
 #include "clipboard.h"
 
-#ifdef SEAMLESS_LINUX
+#ifdef SEAMLESS_X11
 # include "seamless.h"
 #endif
@@ -73 +73 @@
 {
     int rc;
-#ifdef SEAMLESS_LINUX
+#ifdef SEAMLESS_X11
     /** Our instance of the seamless class. */
     VBoxGuestSeamless seamless;
@@ -144 +144 @@
     }
 #endif  /* VBOX_X11_CLIPBOARD defined */
-#ifdef SEAMLESS_LINUX
+#ifdef SEAMLESS_X11
     try
     {
@@ -164 +164 @@
         rc = VERR_UNRESOLVED_ERROR;
     }
-#endif /* SEAMLESS_LINUX defined */
+#endif /* SEAMLESS_X11 defined */
 #ifdef VBOX_X11_CLIPBOARD
     LogRel(("VBoxService: connecting to the shared clipboard service.\n"));
@@ -174 +174 @@
     LogRel(("VBoxService: exiting...\n"));
 #endif  /* VBOX_X11_CLIPBOARD not defined */
-#ifdef SEAMLESS_LINUX
+#ifdef SEAMLESS_X11
     try
     {
@@ -189 +189 @@
         rc = VERR_UNRESOLVED_ERROR;
     }
-#endif /* SEAMLESS_LINUX defined */
+#endif /* SEAMLESS_X11 defined */
     return rc;
 }