aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2009-08-07 15:31:27 +0000
committermarha <marha@users.sourceforge.net>2009-08-07 15:31:27 +0000
commita5791878ca9158f776e6fccbf925bb7aa8aec8f2 (patch)
tree51c90c7ad309faf23b5797fd8ac736f85586bbce
parent9b9c9dadd6bc6b093defe069a7605a78acbc2d3b (diff)
downloadvcxsrv-a5791878ca9158f776e6fccbf925bb7aa8aec8f2.tar.gz
vcxsrv-a5791878ca9158f776e6fccbf925bb7aa8aec8f2.tar.bz2
vcxsrv-a5791878ca9158f776e6fccbf925bb7aa8aec8f2.zip
- Increased version number
- VC used _strdup instead of strdup
-rw-r--r--include/dix-config.h2
-rw-r--r--include/unistd.h1
-rw-r--r--libX11/src/util/makekeys.c1
-rw-r--r--xorg-server/hw/xwin/XWin.rc2
-rw-r--r--xorg-server/installer/vcxsrv.nsi2
5 files changed, 5 insertions, 3 deletions
diff --git a/include/dix-config.h b/include/dix-config.h
index 031bcb56f..54eb60259 100644
--- a/include/dix-config.h
+++ b/include/dix-config.h
@@ -405,7 +405,7 @@
/* #undef XORG_RELEASE */
/* Current Xorg version */
-#define XORG_VERSION_CURRENT (((1) * 10000000) + ((0) * 100000) + ((1) * 1000) + 0)
+#define XORG_VERSION_CURRENT (((1) * 10000000) + ((0) * 100000) + ((2) * 1000) + 0)
/* Xorg release date */
#define XORG_DATE "2 August 2009"
diff --git a/include/unistd.h b/include/unistd.h
index 9bb36d7e0..75e75d3e8 100644
--- a/include/unistd.h
+++ b/include/unistd.h
@@ -3,5 +3,6 @@
#define strcasecmp _stricmp
#define snprintf _snprintf
+#define strdup _strdup
#endif
diff --git a/libX11/src/util/makekeys.c b/libX11/src/util/makekeys.c
index 3fe8a96e6..9f8084448 100644
--- a/libX11/src/util/makekeys.c
+++ b/libX11/src/util/makekeys.c
@@ -36,6 +36,7 @@ from The Open Group.
#include <X11/keysymdef.h>
#include <stdio.h>
#include <stdlib.h>
+#include <unistd.h>
typedef unsigned long Signature;
diff --git a/xorg-server/hw/xwin/XWin.rc b/xorg-server/hw/xwin/XWin.rc
index 6b904155c..43bbe4941 100644
--- a/xorg-server/hw/xwin/XWin.rc
+++ b/xorg-server/hw/xwin/XWin.rc
@@ -45,7 +45,7 @@ FONT 8, "MS Shell Dlg 2"
BEGIN
CONTROL IDI_XWIN, IDC_STATIC, "Static", SS_ICON, 8, 8, 32, 32
LTEXT "VcXsrv X Server ", IDC_STATIC, 36, 8, 220, 8
- LTEXT "Version 1.0.1 (6 Aug 2009)", IDC_STATIC, 36, 18, 220, 8
+ LTEXT "Version 1.0.2 (6 Aug 2009)", IDC_STATIC, 36, 18, 220, 8
DEFPUSHBUTTON "OK", IDOK, 105, 75, 50, 15
END
diff --git a/xorg-server/installer/vcxsrv.nsi b/xorg-server/installer/vcxsrv.nsi
index da7069b7d..625701966 100644
--- a/xorg-server/installer/vcxsrv.nsi
+++ b/xorg-server/installer/vcxsrv.nsi
@@ -11,7 +11,7 @@
Name "VcXsrv"
; The file to write
-OutFile "vcxsrv.1.0.1.installer.exe"
+OutFile "vcxsrv.1.0.2.installer.exe"
; The default installation directory
InstallDir $PROGRAMFILES\VcXsrv