aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-11-04 10:09:09 +0100
committermarha <marha@users.sourceforge.net>2011-11-04 10:09:09 +0100
commit60f8ca2d5842b40b8585c58095787c84edfa9803 (patch)
treeaeacc47c793a60603187aa5b8008f34533d925b5
parent258c22802ff4aa24df1d14046475e430d3f13a52 (diff)
downloadvcxsrv-60f8ca2d5842b40b8585c58095787c84edfa9803.tar.gz
vcxsrv-60f8ca2d5842b40b8585c58095787c84edfa9803.tar.bz2
vcxsrv-60f8ca2d5842b40b8585c58095787c84edfa9803.zip
Solved compile problems
-rw-r--r--xorg-server/hw/xwin/winclipboardwndproc.c1
-rw-r--r--xorg-server/hw/xwin/winprocarg.c4
-rw-r--r--xorg-server/makefile2
3 files changed, 4 insertions, 3 deletions
diff --git a/xorg-server/hw/xwin/winclipboardwndproc.c b/xorg-server/hw/xwin/winclipboardwndproc.c
index e410dd6d9..3d324e2d8 100644
--- a/xorg-server/hw/xwin/winclipboardwndproc.c
+++ b/xorg-server/hw/xwin/winclipboardwndproc.c
@@ -58,6 +58,7 @@ extern void *g_pClipboardDisplay;
extern Window g_iClipboardWindow;
extern Atom g_atomLastOwnedSelection;
extern Bool g_fClipboardStarted;
+extern HWND g_hwndClipboard;
extern Bool g_fClipboardPrimary;
/*
diff --git a/xorg-server/hw/xwin/winprocarg.c b/xorg-server/hw/xwin/winprocarg.c
index 683605ad7..4c34d0c84 100644
--- a/xorg-server/hw/xwin/winprocarg.c
+++ b/xorg-server/hw/xwin/winprocarg.c
@@ -100,13 +100,13 @@ winInitializeScreenDefaults(void)
int dpiX = GetDeviceCaps(hdc, LOGPIXELSX);
int dpiY = GetDeviceCaps(hdc, LOGPIXELSY);
- winErrorFVerb(2, "winInitializeDefaultScreens - native DPI x %d y %d\n", dpiX, dpiY);
+ winDebug("winInitializeDefaultScreens - native DPI x %d y %d\n", dpiX, dpiY);
monitorResolution = dpiY;
ReleaseDC(NULL, hdc);
}
else
{
- winErrorFVerb(1, "winInitializeDefaultScreens - Failed to retrieve native DPI, falling back to default of %d DPI\n", WIN_DEFAULT_DPI);
+ winDebug("winInitializeDefaultScreens - Failed to retrieve native DPI, falling back to default of %d DPI\n", WIN_DEFAULT_DPI);
monitorResolution = WIN_DEFAULT_DPI;
}
}
diff --git a/xorg-server/makefile b/xorg-server/makefile
index 2f0cb251b..e4bdedb7c 100644
--- a/xorg-server/makefile
+++ b/xorg-server/makefile
@@ -10,7 +10,7 @@ INCLUDELIBFILES = \
dix\$(OBJDIR)\libdix.lib \
fb\$(OBJDIR)\libfb.lib \
glx\$(OBJDIR)\libglx.lib \
- hw\xwin\$(OBJDIR)\libxwin.lib \
+ hw\xwin\$(OBJDIR)\libXWin.lib \
hw\xwin\glx\$(OBJDIR)\libwinglx.lib \
mi\$(OBJDIR)\libmi.lib \
miext\damage\$(OBJDIR)\libdamage.lib \