[X2Go-Commits] nx-libs.git - build-baikal (branch) updated: nx-X11/3.4.0-4
X2Go dev team
git-admin at x2go.org
Fri Aug 30 16:23:31 CEST 2013
The branch, build-baikal has been updated
via 17bae6bffd517fd2a148099daea9bf77ff3be1c1 (commit)
from 4fceb197efd5938926ac88b5d730ecec7953623f (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
nx-X11/CHANGELOG | 4 ++++
nx-X11/CHANGELOG.NX.original | 4 ++++
.../src/mesa/drivers/dri/common/glcontextmodes.c | 1 +
...contextmodes.c => glcontextmodes.c.NX.original} | 1 +
...lcontextmodes.c => glcontextmodes.c.X.original} | 0
nx-X11/lib/SM/sm_client.c | 4 +++-
.../SM/{sm_client.c => sm_client.c.NX.original} | 4 +++-
.../SM/{sm_client.c => sm_client.c.SM.original} | 0
nx-X11/programs/Xserver/GL/glx/render2.c | 2 +-
.../GL/glx/{render2.c => render2.c.NX.original} | 2 +-
.../GL/glx/{render2.c => render2.c.X.original} | 0
nx-X11/programs/Xserver/GL/glx/render2swap.c | 2 +-
.../{render2swap.c => render2swap.c.NX.original} | 2 +-
.../{render2swap.c => render2swap.c.X.original} | 0
14 files changed, 20 insertions(+), 6 deletions(-)
copy nx-X11/extras/Mesa/src/mesa/drivers/dri/common/{glcontextmodes.c => glcontextmodes.c.NX.original} (99%)
copy nx-X11/extras/Mesa/src/mesa/drivers/dri/common/{glcontextmodes.c => glcontextmodes.c.X.original} (100%)
copy nx-X11/lib/SM/{sm_client.c => sm_client.c.NX.original} (99%)
copy nx-X11/lib/SM/{sm_client.c => sm_client.c.SM.original} (100%)
copy nx-X11/programs/Xserver/GL/glx/{render2.c => render2.c.NX.original} (99%)
copy nx-X11/programs/Xserver/GL/glx/{render2.c => render2.c.X.original} (100%)
copy nx-X11/programs/Xserver/GL/glx/{render2swap.c => render2swap.c.NX.original} (99%)
copy nx-X11/programs/Xserver/GL/glx/{render2swap.c => render2swap.c.X.original} (100%)
The diff of changes is:
diff --git a/nx-X11/CHANGELOG b/nx-X11/CHANGELOG
index e433f2c..4faf2ad 100644
--- a/nx-X11/CHANGELOG
+++ b/nx-X11/CHANGELOG
@@ -1,5 +1,9 @@
ChangeLog:
+nx-X11-3.4.0-4
+
+- Fixed TR06H02359. Removed compiler warnings.
+
nx-X11-3.4.0-3
- Updated copyright to year 2010.
diff --git a/nx-X11/CHANGELOG.NX.original b/nx-X11/CHANGELOG.NX.original
index e433f2c..4faf2ad 100644
--- a/nx-X11/CHANGELOG.NX.original
+++ b/nx-X11/CHANGELOG.NX.original
@@ -1,5 +1,9 @@
ChangeLog:
+nx-X11-3.4.0-4
+
+- Fixed TR06H02359. Removed compiler warnings.
+
nx-X11-3.4.0-3
- Updated copyright to year 2010.
diff --git a/nx-X11/extras/Mesa/src/mesa/drivers/dri/common/glcontextmodes.c b/nx-X11/extras/Mesa/src/mesa/drivers/dri/common/glcontextmodes.c
index 5e9e352..066c5ff 100644
--- a/nx-X11/extras/Mesa/src/mesa/drivers/dri/common/glcontextmodes.c
+++ b/nx-X11/extras/Mesa/src/mesa/drivers/dri/common/glcontextmodes.c
@@ -44,6 +44,7 @@
# include "GL/glxint.h"
# ifdef XFree86Server
+void *memset( void * ptr, int val, size_t size);
# include "GL/glx_ansic.h"
extern void * __glXMalloc( size_t size );
extern void __glXFree( void * ptr );
diff --git a/nx-X11/extras/Mesa/src/mesa/drivers/dri/common/glcontextmodes.c b/nx-X11/extras/Mesa/src/mesa/drivers/dri/common/glcontextmodes.c.NX.original
similarity index 99%
copy from nx-X11/extras/Mesa/src/mesa/drivers/dri/common/glcontextmodes.c
copy to nx-X11/extras/Mesa/src/mesa/drivers/dri/common/glcontextmodes.c.NX.original
index 5e9e352..066c5ff 100644
--- a/nx-X11/extras/Mesa/src/mesa/drivers/dri/common/glcontextmodes.c
+++ b/nx-X11/extras/Mesa/src/mesa/drivers/dri/common/glcontextmodes.c.NX.original
@@ -44,6 +44,7 @@
# include "GL/glxint.h"
# ifdef XFree86Server
+void *memset( void * ptr, int val, size_t size);
# include "GL/glx_ansic.h"
extern void * __glXMalloc( size_t size );
extern void __glXFree( void * ptr );
diff --git a/nx-X11/extras/Mesa/src/mesa/drivers/dri/common/glcontextmodes.c b/nx-X11/extras/Mesa/src/mesa/drivers/dri/common/glcontextmodes.c.X.original
similarity index 100%
copy from nx-X11/extras/Mesa/src/mesa/drivers/dri/common/glcontextmodes.c
copy to nx-X11/extras/Mesa/src/mesa/drivers/dri/common/glcontextmodes.c.X.original
diff --git a/nx-X11/lib/SM/sm_client.c b/nx-X11/lib/SM/sm_client.c
index 02f9ccd..499be5e 100644
--- a/nx-X11/lib/SM/sm_client.c
+++ b/nx-X11/lib/SM/sm_client.c
@@ -239,7 +239,9 @@ char *errorStringRet;
SIZEOF (smRegisterClientMsg), WORD64COUNT (extra),
smRegisterClientMsg, pMsg, pData);
- STORE_ARRAY8 (pData, 0, NULL);
+ previousId = NULL;
+
+ STORE_ARRAY8 (pData, 0, previousId);
IceFlush (iceConn);
diff --git a/nx-X11/lib/SM/sm_client.c b/nx-X11/lib/SM/sm_client.c.NX.original
similarity index 99%
copy from nx-X11/lib/SM/sm_client.c
copy to nx-X11/lib/SM/sm_client.c.NX.original
index 02f9ccd..499be5e 100644
--- a/nx-X11/lib/SM/sm_client.c
+++ b/nx-X11/lib/SM/sm_client.c.NX.original
@@ -239,7 +239,9 @@ char *errorStringRet;
SIZEOF (smRegisterClientMsg), WORD64COUNT (extra),
smRegisterClientMsg, pMsg, pData);
- STORE_ARRAY8 (pData, 0, NULL);
+ previousId = NULL;
+
+ STORE_ARRAY8 (pData, 0, previousId);
IceFlush (iceConn);
diff --git a/nx-X11/lib/SM/sm_client.c b/nx-X11/lib/SM/sm_client.c.SM.original
similarity index 100%
copy from nx-X11/lib/SM/sm_client.c
copy to nx-X11/lib/SM/sm_client.c.SM.original
diff --git a/nx-X11/programs/Xserver/GL/glx/render2.c b/nx-X11/programs/Xserver/GL/glx/render2.c
index 39d0c13..f4491b2 100644
--- a/nx-X11/programs/Xserver/GL/glx/render2.c
+++ b/nx-X11/programs/Xserver/GL/glx/render2.c
@@ -43,7 +43,7 @@
#include "unpack.h"
#include "g_disptab.h"
#include "g_disptab_EXT.h"
-
+#include "indirect_size.h"
void __glXDisp_Map1f(GLbyte *pc)
{
diff --git a/nx-X11/programs/Xserver/GL/glx/render2.c b/nx-X11/programs/Xserver/GL/glx/render2.c.NX.original
similarity index 99%
copy from nx-X11/programs/Xserver/GL/glx/render2.c
copy to nx-X11/programs/Xserver/GL/glx/render2.c.NX.original
index 39d0c13..f4491b2 100644
--- a/nx-X11/programs/Xserver/GL/glx/render2.c
+++ b/nx-X11/programs/Xserver/GL/glx/render2.c.NX.original
@@ -43,7 +43,7 @@
#include "unpack.h"
#include "g_disptab.h"
#include "g_disptab_EXT.h"
-
+#include "indirect_size.h"
void __glXDisp_Map1f(GLbyte *pc)
{
diff --git a/nx-X11/programs/Xserver/GL/glx/render2.c b/nx-X11/programs/Xserver/GL/glx/render2.c.X.original
similarity index 100%
copy from nx-X11/programs/Xserver/GL/glx/render2.c
copy to nx-X11/programs/Xserver/GL/glx/render2.c.X.original
diff --git a/nx-X11/programs/Xserver/GL/glx/render2swap.c b/nx-X11/programs/Xserver/GL/glx/render2swap.c
index 65ac5e1..0225970 100644
--- a/nx-X11/programs/Xserver/GL/glx/render2swap.c
+++ b/nx-X11/programs/Xserver/GL/glx/render2swap.c
@@ -43,7 +43,7 @@
#include "unpack.h"
#include "g_disptab.h"
#include "g_disptab_EXT.h"
-
+#include "indirect_size.h"
void __glXDispSwap_Map1f(GLbyte *pc)
{
diff --git a/nx-X11/programs/Xserver/GL/glx/render2swap.c b/nx-X11/programs/Xserver/GL/glx/render2swap.c.NX.original
similarity index 99%
copy from nx-X11/programs/Xserver/GL/glx/render2swap.c
copy to nx-X11/programs/Xserver/GL/glx/render2swap.c.NX.original
index 65ac5e1..0225970 100644
--- a/nx-X11/programs/Xserver/GL/glx/render2swap.c
+++ b/nx-X11/programs/Xserver/GL/glx/render2swap.c.NX.original
@@ -43,7 +43,7 @@
#include "unpack.h"
#include "g_disptab.h"
#include "g_disptab_EXT.h"
-
+#include "indirect_size.h"
void __glXDispSwap_Map1f(GLbyte *pc)
{
diff --git a/nx-X11/programs/Xserver/GL/glx/render2swap.c b/nx-X11/programs/Xserver/GL/glx/render2swap.c.X.original
similarity index 100%
copy from nx-X11/programs/Xserver/GL/glx/render2swap.c
copy to nx-X11/programs/Xserver/GL/glx/render2swap.c.X.original
hooks/post-receive
--
nx-libs.git (NX (redistributed))
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "nx-libs.git" (NX (redistributed)).
More information about the x2go-commits
mailing list