From 739cd7e1d06e838329eb17052ff2a51122587e65 Mon Sep 17 00:00:00 2001 From: bergamaschi Date: Thu, 13 Dec 2012 10:01:50 +0000 Subject: [PATCH] revision added to mythen Server works git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@380 951219d9-93cf-4727-9268-0efd64621fa3 --- slsDetectorSoftware/mythenDetectorServer/server_funcs.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/slsDetectorSoftware/mythenDetectorServer/server_funcs.c b/slsDetectorSoftware/mythenDetectorServer/server_funcs.c index fcba20b4e..35322323e 100755 --- a/slsDetectorSoftware/mythenDetectorServer/server_funcs.c +++ b/slsDetectorSoftware/mythenDetectorServer/server_funcs.c @@ -528,7 +528,7 @@ enum externalCommunicationMode{ int get_id(int file_des) { // sends back 64 bits! - int64_t retval, rev; + int64_t retval, rev, dat; int ret=OK; int imod=-1; int n=0; @@ -584,8 +584,8 @@ int get_id(int file_des) { sscanf(THIS_REVISION,"$Rev : %x",&rev1); rev=((int64_t)rev1); - - retval=(THIS_SOFTWARE_VERSION<<32) | rev; + dat=THIS_SOFTWARE_VERSION; + retval=(dat<<32) | rev; break; default: