detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-09 11:30:43 +02:00
Code Issues Actions Packages Releases Activity

merged with annas, removed a <<< head merge conflict

Browse Source
This commit is contained in:
Dhanya Maliakal 2017-06-14 11:36:44 +02:00
parent feb1ef4ea5
commit 5176ad521f
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
slsDetectorSoftware/commonFiles/communication_funcs.c
View File

@ -328,15 +328,9 @@ int receiveData(int file_des, void* buf,int length, intType itype){
int nreceiving; int nreceiving;
int nreceived; int nreceived;
if (file_des<0) return -1; if (file_des<0) return -1;
<<<<<<< HEAD
#ifdef VERY_VERBOSE #ifdef VERY_VERBOSE
printf("want to receive %d Bytes\n", length); printf("want to receive %d Bytes\n", length);
#endif #endif
=======
#ifdef VERY_VERBOSE
printf("want to receive %d Bytes\n", length);
#endif
>>>>>>> e564542ad33a64e66ad6153066741c69c707f99d
while(length > 0) { while(length > 0) {
nreceiving = (length>send_rec_max_size) ? send_rec_max_size:length; nreceiving = (length>send_rec_max_size) ? send_rec_max_size:length;