summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/iprt/vector.h (renamed from src/VBox/Additions/x11/VBoxClient/vector.h)0
-rw-r--r--src/VBox/Additions/x11/VBoxClient/Makefile.kmk8
-rw-r--r--src/VBox/Additions/x11/VBoxClient/seamless-x11.cpp3
-rw-r--r--src/VBox/Runtime/testcase/Makefile.kmk6
-rw-r--r--src/VBox/Runtime/testcase/tstVector.cpp (renamed from src/VBox/Additions/x11/VBoxClient/testcase/tstVector.cpp)3
5 files changed, 8 insertions, 12 deletions
diff --git a/src/VBox/Additions/x11/VBoxClient/vector.h b/include/iprt/vector.h
index 5bcd9791469..5bcd9791469 100644
--- a/src/VBox/Additions/x11/VBoxClient/vector.h
+++ b/include/iprt/vector.h
diff --git a/src/VBox/Additions/x11/VBoxClient/Makefile.kmk b/src/VBox/Additions/x11/VBoxClient/Makefile.kmk
index e6dbc2030b2..5a6f0fcac13 100644
--- a/src/VBox/Additions/x11/VBoxClient/Makefile.kmk
+++ b/src/VBox/Additions/x11/VBoxClient/Makefile.kmk
@@ -93,14 +93,6 @@ $$(tstSeamlessX11-auto_0_OUTDIR)/tstSeamlessX11-auto.run: \
export VBOX_LOG_DEST=nofile; $(INSTARGET_tstSeamlessX11-auto) quiet
$(QUIET)$(APPEND) -t "$@" "done"
- PROGRAMS += tstVector
- tstVector_TEMPLATE = VBOXR3TSTEXE
- tstVector_SOURCES = \
- testcase/tstVector.cpp
- tstVector_INCS = .
- tstVector_LIBS = \
- $(LIB_RUNTIME)
-
#
# Additional testcase designed to be run manually, which initiates and starts the Linux
# guest client part of the seamless additions in the host, faking seamless events from
diff --git a/src/VBox/Additions/x11/VBoxClient/seamless-x11.cpp b/src/VBox/Additions/x11/VBoxClient/seamless-x11.cpp
index 9e345d84a9a..6b5122e9845 100644
--- a/src/VBox/Additions/x11/VBoxClient/seamless-x11.cpp
+++ b/src/VBox/Additions/x11/VBoxClient/seamless-x11.cpp
@@ -20,7 +20,6 @@
#include <iprt/err.h>
#include <iprt/assert.h>
-#include <iprt/vector.h>
#include <VBox/log.h>
#include "seamless-guest.h"
@@ -30,6 +29,8 @@
#include <limits.h>
+#include "vector.h"
+
#ifdef TESTCASE
#undef DefaultRootWindow
#define DefaultRootWindow XDefaultRootWindow
diff --git a/src/VBox/Runtime/testcase/Makefile.kmk b/src/VBox/Runtime/testcase/Makefile.kmk
index ea38c2785f8..373dcf412bf 100644
--- a/src/VBox/Runtime/testcase/Makefile.kmk
+++ b/src/VBox/Runtime/testcase/Makefile.kmk
@@ -123,7 +123,8 @@ PROGRAMS += \
tstUtf8 \
tstRTUuid \
tstRTCircBuf \
- tstRTManifest
+ tstRTManifest \
+ tstVector
PROGRAMS.win += \
tstRTProcWait \
@@ -512,6 +513,9 @@ tstRTManifest_SOURCES = tstRTManifest.cpp
tstRTCoreDump_TEMPLACE = VBOXR3TSTEXE
tstRTCoreDump_SOURCES = tstRTCoreDump.cpp
+tstVector_TEMPLATE = VBOXR3TSTEXE
+tstVector_SOURCES = tstVector.cpp
+
#
# Ring-0 testcases.
diff --git a/src/VBox/Additions/x11/VBoxClient/testcase/tstVector.cpp b/src/VBox/Runtime/testcase/tstVector.cpp
index 43e9bf18e7b..5cf1115fde5 100644
--- a/src/VBox/Additions/x11/VBoxClient/testcase/tstVector.cpp
+++ b/src/VBox/Runtime/testcase/tstVector.cpp
@@ -18,9 +18,8 @@
/*******************************************************************************
* Header Files *
*******************************************************************************/
-#include "vector.h"
-
#include <iprt/test.h>
+#include <iprt/vector.h>
#include <stdlib.h> /* For realloc */