4 files changed, 13 insertions, 8 deletions
diff --git a/nx-X11/programs/Xserver/dix/Imakefile b/nx-X11/programs/Xserver/dix/Imakefile
index d153805df..f141719f7 100644
--- a/nx-X11/programs/Xserver/dix/Imakefile
+++ b/nx-X11/programs/Xserver/dix/Imakefile
@@ -36,6 +36,7 @@ SRCS =                          \
        devices.c                \
        dixutils.c               \
        extension.c              \
+       ffs.c                    \
        gc.c                     \
        globals.c                \
        grabs.c                  \
@@ -58,6 +59,7 @@ OBJS =                          \
        devices.o                \
        dixutils.o               \
        extension.o              \
+       ffs.o                    \
        gc.o                     \
        globals.o                \
        grabs.o                  \
diff --git a/nx-X11/programs/Xserver/dix/dispatch.c b/nx-X11/programs/Xserver/dix/dispatch.c
index 6d0d61a15..ac5d07281 100644
--- a/nx-X11/programs/Xserver/dix/dispatch.c
+++ b/nx-X11/programs/Xserver/dix/dispatch.c
@@ -209,7 +209,7 @@ UpdateCurrentTimeIf()
     systime.milliseconds = GetTimeInMillis();
     if (systime.milliseconds < currentTime.milliseconds)
 	systime.months++;
-    if (*checkForInput[0] == *checkForInput[1])
+    if (CompareTimeStamps(systime, currentTime) == LATER)
 	currentTime = systime;
 }
 
@@ -3642,11 +3642,7 @@ void InitClient(ClientPtr client, int i, void * ospriv)
 }
 
 int
-#ifdef NXAGENT_SERVER
-xorg_InitClientPrivates(ClientPtr client)
-#else
 InitClientPrivates(ClientPtr client)
-#endif
 {
     register char *ptr;
     DevUnion *ppriv;
@@ -3960,7 +3956,12 @@ DeleteClientFromAnySelections(ClientPtr client)
 	        SelectionInfoRec    info;
 
 		info.selection = &CurrentSelections[i];
+#ifdef NXAGENT_SERVER
+                /* bugfix missing in upstream before introduction of selection.c */
+		info.kind = SelectionClientClose;
+#else
 		info.kind = SelectionWindowDestroy;
+#endif
 		CallCallbacks(&SelectionCallback, &info);
 	    }
             CurrentSelections[i].pWin = (WindowPtr)NULL;
diff --git a/nx-X11/programs/Xserver/dix/dixfonts.c b/nx-X11/programs/Xserver/dix/dixfonts.c
index f1fa53f69..e3e90b163 100644
--- a/nx-X11/programs/Xserver/dix/dixfonts.c
+++ b/nx-X11/programs/Xserver/dix/dixfonts.c
@@ -1958,9 +1958,12 @@ SetFontPath(ClientPtr client, int npaths, unsigned char *paths)
     return err;
 }
 
-#ifndef NXAGENT_SERVER
 int
+#ifdef NXAGENT_SERVER
+xorg_SetDefaultFontPath(char *path)
+#else
 SetDefaultFontPath(char *path)
+#endif
 {
     char       *temp_path,
                *start,
@@ -2027,7 +2030,6 @@ SetDefaultFontPath(char *path)
 
     return err;
 }
-#endif /* NXAGENT_SERVER */
 
 unsigned char *
 GetFontPath(int *count, int *length)
diff --git a/nx-X11/programs/Xserver/dix/property.c b/nx-X11/programs/Xserver/dix/property.c
index f46b53f7c..f0bfe1e65 100644
--- a/nx-X11/programs/Xserver/dix/property.c
+++ b/nx-X11/programs/Xserver/dix/property.c
@@ -257,7 +257,7 @@ ProcChangeProperty(ClientPtr client)
 
 int
 #ifdef NXAGENT_SERVER
-Xorg_ChangeWindowProperty(WindowPtr pWin, Atom property, Atom type, int format,
+xorg_ChangeWindowProperty(WindowPtr pWin, Atom property, Atom type, int format,
                      int mode, unsigned long len, void * value,
                      Bool sendevent)
 #else