Description: Add missing header includes.
Author: Andrey Rakhmatullin <wrar@debian.org>
Bug-Debian: https://bugs.debian.org/1066718
Last-Update: 2024-03-27

Index: ctn-3.2.0~dfsg/facilities/manage/control.c
===================================================================
--- ctn-3.2.0~dfsg.orig/facilities/manage/control.c
+++ ctn-3.2.0~dfsg/facilities/manage/control.c
@@ -64,6 +64,8 @@ static char rcsid[] = "$Revision: 1.32 $
 #include <errno.h>
 #include <string.h>
 #include <stdlib.h>
+#include <unistd.h>
+#include <ctype.h>
 #ifdef _MSC_VER
 #include <direct.h>
 #include <process.h>
@@ -78,6 +80,7 @@ static char rcsid[] = "$Revision: 1.32 $
 #include <sys/socket.h>
 #include <sys/param.h>
 #include <netinet/in.h>
+#include <arpa/inet.h>
 #include <netdb.h>
 #endif
 
Index: ctn-3.2.0~dfsg/facilities/database/database.c
===================================================================
--- ctn-3.2.0~dfsg.orig/facilities/database/database.c
+++ ctn-3.2.0~dfsg/facilities/database/database.c
@@ -83,6 +83,8 @@
 /*lint +e652 */
 #include <sys/types.h>
 #include <sys/time.h>
+#include <time.h>
+#include <unistd.h>
 #include "dicom.h"
 #include "condition.h"
 #include "hunk_man.h"
Index: ctn-3.2.0~dfsg/facilities/objects/dcm.c
===================================================================
--- ctn-3.2.0~dfsg.orig/facilities/objects/dcm.c
+++ ctn-3.2.0~dfsg/facilities/objects/dcm.c
@@ -96,6 +96,10 @@
 static char rcsid[] = "$Revision: 1.170 $ $RCSfile: dcm.c,v $";
 
 
+#define _XOPEN_SOURCE
+#include <ctype.h>
+#include <unistd.h>
+
 #include "ctn_os.h"
 
 #include "dicom.h"
Index: ctn-3.2.0~dfsg/facilities/fis/fisinsert.c
===================================================================
--- ctn-3.2.0~dfsg.orig/facilities/fis/fisinsert.c
+++ ctn-3.2.0~dfsg/facilities/fis/fisinsert.c
@@ -50,6 +50,7 @@ static char rcsid[] = "$Revision: 1.11 $
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 
 #include "dicom.h"
 #include "condition.h"
Index: ctn-3.2.0~dfsg/facilities/gq/gq.c
===================================================================
--- ctn-3.2.0~dfsg.orig/facilities/gq/gq.c
+++ ctn-3.2.0~dfsg/facilities/gq/gq.c
@@ -56,6 +56,7 @@ static char rcsid[] = "$Revision: 1.20 $
 #include	<stdlib.h>
 #include	<string.h>
 #include	<errno.h>
+#include	<unistd.h>
 
 #if defined(SHARED_MEMORY) && defined(SEMAPHORE)
 #include	<sys/types.h>
Index: ctn-3.2.0~dfsg/facilities/hap/hapbuildinterp.c
===================================================================
--- ctn-3.2.0~dfsg.orig/facilities/hap/hapbuildinterp.c
+++ ctn-3.2.0~dfsg/facilities/hap/hapbuildinterp.c
@@ -62,6 +62,7 @@ static char rcsid[] = "$Revision: 1.13 $
 #include "hap.h"
 #include "dicom_sq.h"
 #include "dicom_uids.h"
+#include "condition.h"
 
 #define HAP_X_VARIABLE_EVENT	HAP_I_VARIABLE_EVENT
 
Index: ctn-3.2.0~dfsg/facilities/hap/hapbuildpatient.c
===================================================================
--- ctn-3.2.0~dfsg.orig/facilities/hap/hapbuildpatient.c
+++ ctn-3.2.0~dfsg/facilities/hap/hapbuildpatient.c
@@ -61,6 +61,7 @@ static char rcsid[] = "$Revision: 1.16 $
 #include "hap.h"
 #include "dicom_sq.h"
 #include "dicom_uids.h"
+#include "condition.h"
 
 #define HAP_X_VARIABLE_EVENT	HAP_P_VARIABLE_EVENT
 
Index: ctn-3.2.0~dfsg/facilities/hap/hapbuildresults.c
===================================================================
--- ctn-3.2.0~dfsg.orig/facilities/hap/hapbuildresults.c
+++ ctn-3.2.0~dfsg/facilities/hap/hapbuildresults.c
@@ -61,6 +61,7 @@ static char rcsid[] = "$Revision: 1.7 $
 #include "hap.h"
 #include "dicom_sq.h"
 #include "dicom_uids.h"
+#include "condition.h"
 
 #define HAP_X_VARIABLE_EVENT	HAP_R_VARIABLE_EVENT
 
Index: ctn-3.2.0~dfsg/facilities/hap/hapbuildstudy.c
===================================================================
--- ctn-3.2.0~dfsg.orig/facilities/hap/hapbuildstudy.c
+++ ctn-3.2.0~dfsg/facilities/hap/hapbuildstudy.c
@@ -61,6 +61,7 @@ static char rcsid[] = "$Revision: 1.18 $
 #include "hap.h"
 #include "dicom_uids.h"
 #include "dicom_sq.h"
+#include "condition.h"
 
 
 #define HAP_X_VARIABLE_EVENT	HAP_S_VARIABLE_EVENT
Index: ctn-3.2.0~dfsg/facilities/hap/hapbuildvisit.c
===================================================================
--- ctn-3.2.0~dfsg.orig/facilities/hap/hapbuildvisit.c
+++ ctn-3.2.0~dfsg/facilities/hap/hapbuildvisit.c
@@ -61,6 +61,7 @@ static char rcsid[] = "$Revision: 1.18 $
 #include "hap.h"
 #include "dicom_sq.h"
 #include "dicom_uids.h"
+#include "condition.h"
 
 #define HAP_X_VARIABLE_EVENT	HAP_V_VARIABLE_EVENT
 
Index: ctn-3.2.0~dfsg/facilities/his/hisdb.c
===================================================================
--- ctn-3.2.0~dfsg.orig/facilities/his/hisdb.c
+++ ctn-3.2.0~dfsg/facilities/his/hisdb.c
@@ -75,6 +75,7 @@
 #include <string.h>
 #include <ctype.h>
 #include <sys/types.h>
+#include <unistd.h>
 /*#include <sys/time.h> */
 #include "dicom.h"
 #include "condition.h"
Index: ctn-3.2.0~dfsg/facilities/hunks/hunk_man.c
===================================================================
--- ctn-3.2.0~dfsg.orig/facilities/hunks/hunk_man.c
+++ ctn-3.2.0~dfsg/facilities/hunks/hunk_man.c
@@ -71,6 +71,7 @@ static char rcsid[] = "$Revision: 1.11 $
 #include <stdlib.h>
 #include <string.h>
 #include <fcntl.h>
+#include <unistd.h>
 #ifdef _MSC_VER
 #include <io.h>
 #include <sys/types.h>
Index: ctn-3.2.0~dfsg/facilities/icon/icon.c
===================================================================
--- ctn-3.2.0~dfsg.orig/facilities/icon/icon.c
+++ ctn-3.2.0~dfsg/facilities/icon/icon.c
@@ -68,9 +68,7 @@ static char rcsid[] = "$Revision: 1.10 $
 #include <sys/stat.h>
 #endif
 #include <fcntl.h>
-#ifdef GCCSUNOS
 #include <unistd.h>
-#endif
 
 #include "dicom.h"
 #include "condition.h"
Index: ctn-3.2.0~dfsg/facilities/tbl/tbl.h
===================================================================
--- ctn-3.2.0~dfsg.orig/facilities/tbl/tbl.h
+++ ctn-3.2.0~dfsg/facilities/tbl/tbl.h
@@ -54,6 +54,8 @@
 extern "C" {
 #endif
 
+#include <string.h>
+
 typedef void TBL_HANDLE;
 
 typedef enum {
Index: ctn-3.2.0~dfsg/facilities/motif_utl/motifutil.c
===================================================================
--- ctn-3.2.0~dfsg.orig/facilities/motif_utl/motifutil.c
+++ ctn-3.2.0~dfsg/facilities/motif_utl/motifutil.c
@@ -77,6 +77,7 @@ static char rcsid[] = "$Revision: 1.12 $
 #include "dicom.h"
 #include "lst.h"
 #include "mut.h"
+#include "condition.h"
 
 /* MUT_LoadList
 **
Index: ctn-3.2.0~dfsg/facilities/utility/utility.c
===================================================================
--- ctn-3.2.0~dfsg.orig/facilities/utility/utility.c
+++ ctn-3.2.0~dfsg/facilities/utility/utility.c
@@ -52,6 +52,8 @@
 ** Status:		$State: Exp $
 */
 
+#include <ctype.h>
+
 #include "ctn_os.h"
 
 #include "dicom.h"
Index: ctn-3.2.0~dfsg/facilities/idb/idb.c
===================================================================
--- ctn-3.2.0~dfsg.orig/facilities/idb/idb.c
+++ ctn-3.2.0~dfsg/facilities/idb/idb.c
@@ -56,6 +56,8 @@ static char rcsid[] = "$Revision: 1.48 $
 #endif
 #include <string.h>
 #include <ctype.h>
+#include <stdlib.h>
+#include <unistd.h>
 #ifndef _MSC_VER
 #include <sys/types.h>
 #include <sys/time.h>
@@ -67,9 +69,8 @@ static char rcsid[] = "$Revision: 1.48 $
 #include "tbl.h"
 #include "idb.h"
 #include "utility.h"
-#ifdef CTN_USE_THREADS
+#include "condition.h"
 #include "ctnthread.h"
-#endif
 
 #define SCALING_FACTOR 1000
 
Index: ctn-3.2.0~dfsg/apps/ctnnetwork/ctnnetwork.c
===================================================================
--- ctn-3.2.0~dfsg.orig/apps/ctnnetwork/ctnnetwork.c
+++ ctn-3.2.0~dfsg/apps/ctnnetwork/ctnnetwork.c
@@ -104,6 +104,10 @@ static void
     ReleaseSlot(CTNNETWORK_Queue *element);
 static void
     UpdateSlot(int index, CTNNETWORK_Queue *element);
+static int
+    GetUnusedSlot(CTNNETWORK_Queue *element);
+static int
+    FindSlot(CTNNETWORK_Queue *element);
 
 /*******************************************************************/
 main(int argc, char **argv)
Index: ctn-3.2.0~dfsg/apps/ctnnetwork/kill_ctnnetwork.c
===================================================================
--- ctn-3.2.0~dfsg.orig/apps/ctnnetwork/kill_ctnnetwork.c
+++ ctn-3.2.0~dfsg/apps/ctnnetwork/kill_ctnnetwork.c
@@ -49,6 +49,7 @@ static char rcsid[] = "$Revision: 1.15 $
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
 #include "dicom.h"
 #include "ctnthread.h"
 #include "condition.h"
Index: ctn-3.2.0~dfsg/apps/dcm_create_object/create.h
===================================================================
--- ctn-3.2.0~dfsg.orig/apps/dcm_create_object/create.h
+++ ctn-3.2.0~dfsg/apps/dcm_create_object/create.h
@@ -54,6 +54,7 @@ extern CTNBOOLEAN
     verbose;
 CONDITION
 makeElement(int, int, void *, DCM_ELEMENT **);
+int yylex();
 void yyerror(const char *);
 
 #endif
Index: ctn-3.2.0~dfsg/apps/dcm_modify_object/modify.h
===================================================================
--- ctn-3.2.0~dfsg.orig/apps/dcm_modify_object/modify.h
+++ ctn-3.2.0~dfsg/apps/dcm_modify_object/modify.h
@@ -67,4 +67,5 @@ CONDITION
 makeModifications(LST_HEAD **, DCM_OBJECT **);
 void
     APP_DumpModList(LST_HEAD **, int);
+int yylex();
 void yyerror(const char *);
Index: ctn-3.2.0~dfsg/apps/dcm_create_object/lex_mod.c
===================================================================
--- ctn-3.2.0~dfsg.orig/apps/dcm_create_object/lex_mod.c
+++ ctn-3.2.0~dfsg/apps/dcm_create_object/lex_mod.c
@@ -9,8 +9,7 @@
 #define YY_FLEX_MINOR_VERSION 5
 
 #include <stdio.h>
-/* Line below removed by SMM, 2004.09.08 */
-/*#include <unistd.h>*/
+#include <unistd.h>
 
 
 /* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */
Index: ctn-3.2.0~dfsg/apps/dcm_create_object/dcm_create_object.c
===================================================================
--- ctn-3.2.0~dfsg.orig/apps/dcm_create_object/dcm_create_object.c
+++ ctn-3.2.0~dfsg/apps/dcm_create_object/dcm_create_object.c
@@ -64,6 +64,7 @@
 */
 
 static char rcsid[] = "$Revision: 1.28 $ $RCSfile: dcm_create_object.c,v $";
+#include <unistd.h>
 #include "create.h"
 
 DCM_OBJECT
Index: ctn-3.2.0~dfsg/apps/dcm_dump_element/dcm_dump_element.c
===================================================================
--- ctn-3.2.0~dfsg.orig/apps/dcm_dump_element/dcm_dump_element.c
+++ ctn-3.2.0~dfsg/apps/dcm_dump_element/dcm_dump_element.c
@@ -65,6 +65,7 @@ static char rcsid[] = "$Revision: 1.26 $
 #include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <unistd.h>
 #ifdef _MSC_VER
 #include <io.h>
 #endif
Index: ctn-3.2.0~dfsg/apps/dcm_make_object/dcm_make_object.c
===================================================================
--- ctn-3.2.0~dfsg.orig/apps/dcm_make_object/dcm_make_object.c
+++ ctn-3.2.0~dfsg/apps/dcm_make_object/dcm_make_object.c
@@ -68,6 +68,7 @@ static char rcsid[] = "$Revision: 1.18 $
 #endif
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <unistd.h>
 #include "dicom.h"
 #include "ctnthread.h"
 #include "lst.h"
Index: ctn-3.2.0~dfsg/apps/dcm_modify_elements/dcm_modify_elements.c
===================================================================
--- ctn-3.2.0~dfsg.orig/apps/dcm_modify_elements/dcm_modify_elements.c
+++ ctn-3.2.0~dfsg/apps/dcm_modify_elements/dcm_modify_elements.c
@@ -72,6 +72,7 @@ static char rcsid[] = "$Revision: 1.24 $
 #endif
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <unistd.h>
 #include "dicom.h"
 #include "ctnthread.h"
 #include "condition.h"
Index: ctn-3.2.0~dfsg/apps/dcm_modify_object/dcm_modify_object.c
===================================================================
--- ctn-3.2.0~dfsg.orig/apps/dcm_modify_object/dcm_modify_object.c
+++ ctn-3.2.0~dfsg/apps/dcm_modify_object/dcm_modify_object.c
@@ -64,6 +64,7 @@
 */
 
 static char rcsid[] = "$Revision: 1.21 $ $RCSfile: dcm_modify_object.c,v $";
+#include <unistd.h>
 #include "modify.h"
 
 LST_HEAD
Index: ctn-3.2.0~dfsg/apps/displays/ctndisp_x_support.c
===================================================================
--- ctn-3.2.0~dfsg.orig/apps/displays/ctndisp_x_support.c
+++ ctn-3.2.0~dfsg/apps/displays/ctndisp_x_support.c
@@ -56,6 +56,7 @@ static char rcsid[] = "$Revision: 1.9 $
 #include	<X11/Xos.h>
 #include	<X11/Xatom.h>
 #include	<stdio.h>
+#include	<stdlib.h>
 #include	"dicom.h"
 #include	"condition.h"
 #include	"lst.h"
Index: ctn-3.2.0~dfsg/apps/displays/ctndisp.c
===================================================================
--- ctn-3.2.0~dfsg.orig/apps/displays/ctndisp.c
+++ ctn-3.2.0~dfsg/apps/displays/ctndisp.c
@@ -83,6 +83,7 @@ typedef struct _XImageStruct {
 void CTNDISP_AdjustImageDepth(ImageStruct * img);
 void CTNDISP_DisplayImageData(ImageStruct * img, XImageStruct * ximg);
 void CTNDISP_RefreshImageData(ImageStruct * img, XImageStruct * ximg);
+void CTNDISP_UnDisplayImageData(ImageStruct * img, XImageStruct * ximg);
 
 /*
  * Globals (preceded with G_)...declared extern in other files
Index: ctn-3.2.0~dfsg/apps/displays/image_utils.c
===================================================================
--- ctn-3.2.0~dfsg.orig/apps/displays/image_utils.c
+++ ctn-3.2.0~dfsg/apps/displays/image_utils.c
@@ -59,6 +59,7 @@ static char rcsid[] = "$Revision: 1.20 $
 #include 	<sys/time.h>
 #endif
 #include	<math.h>
+#include	<unistd.h>
 
 #if 0
 #include        <X11/Xlib.h>
Index: ctn-3.2.0~dfsg/apps/displays/dcm_x_disp.c
===================================================================
--- ctn-3.2.0~dfsg.orig/apps/displays/dcm_x_disp.c
+++ ctn-3.2.0~dfsg/apps/displays/dcm_x_disp.c
@@ -84,6 +84,7 @@ typedef struct _XImageStruct {
 
 void DisplayImageData(ImageStruct * img, XImageStruct * ximg);
 void RefreshImageData(ImageStruct * img, XImageStruct * ximg);
+void AdjustImageDepth(ImageStruct * img);
 
 /*
  * Globals (preceded with G_)...declared extern in other files
Index: ctn-3.2.0~dfsg/apps/fillRSA/workImpInterp.c
===================================================================
--- ctn-3.2.0~dfsg.orig/apps/fillRSA/workImpInterp.c
+++ ctn-3.2.0~dfsg/apps/fillRSA/workImpInterp.c
@@ -70,6 +70,7 @@ static char rcsid[] = "$Revision: 1.5 $
 #include "manage.h"
 #include "idb.h"
 #include "fis.h"
+#include "utility.h"
 
 extern char *retrieveAETitle;
 
Index: ctn-3.2.0~dfsg/apps/icon/icon_append_index.c
===================================================================
--- ctn-3.2.0~dfsg.orig/apps/icon/icon_append_index.c
+++ ctn-3.2.0~dfsg/apps/icon/icon_append_index.c
@@ -64,6 +64,7 @@ static char rcsid[] = "$Revision: 1.15 $
 #endif
 #include <sys/stat.h>
 #include <string.h>
+#include <unistd.h>
 #include "dicom.h"
 #include "ctnthread.h"
 #include "lst.h"
Index: ctn-3.2.0~dfsg/apps/image_archive/requests.c
===================================================================
--- ctn-3.2.0~dfsg.orig/apps/image_archive/requests.c
+++ ctn-3.2.0~dfsg/apps/image_archive/requests.c
@@ -139,6 +139,21 @@ storeImage(DMAN_HANDLE ** handle, char *
 
 extern CTNBOOLEAN silent;
 
+void
+queueInitialize();
+void
+queueNewAssociation(const char* node);
+void
+queueNetworkNewAssociation(const char* node);
+void
+queueClosedAssociation(const char* node, int count);
+void
+queueDisplayImage(const char* node, const char* name);
+void
+queueNewImage(const char* node, int count);
+void
+networkqueuePartialImage(const char* node, int percentage);
+
 /* serviceRequests
 **
 ** Purpose:
Index: ctn-3.2.0~dfsg/apps/image_archive/move.c
===================================================================
--- ctn-3.2.0~dfsg.orig/apps/image_archive/move.c
+++ ctn-3.2.0~dfsg/apps/image_archive/move.c
@@ -118,6 +118,21 @@ establishSendAssociation(DUL_NETWORKKEY
 			 DMAN_HANDLE ** handle,
 			 DUL_ASSOCIATIONKEY ** sendAssociation,
 			 DUL_ASSOCIATESERVICEPARAMETERS * params);
+void
+queueClosedTransmitAssociation(const char* caller,
+                               const char* destination,
+                               int count);
+void
+queueTransmitAssociation(const char* caller,
+                         const char* destination);
+void
+queueTransmitImage(const char* caller,
+                   const char* destination,
+                   int percentage);
+void
+queueStartTransmit(const char* caller,
+                   const char* destination,
+                   int count);
 
 /* moveRequest
 **
Index: ctn-3.2.0~dfsg/apps/image_archive/parse.c
===================================================================
--- ctn-3.2.0~dfsg.orig/apps/image_archive/parse.c
+++ ctn-3.2.0~dfsg/apps/image_archive/parse.c
@@ -47,6 +47,8 @@
 
 static char rcsid[] = "$Revision: 1.10 $ $RCSfile: parse.c,v $";
 
+#include <ctype.h>
+
 #include "ctn_os.h"
 
 #include "dicom.h"
Index: ctn-3.2.0~dfsg/apps/image_server/cget.c
===================================================================
--- ctn-3.2.0~dfsg.orig/apps/image_server/cget.c
+++ ctn-3.2.0~dfsg/apps/image_server/cget.c
@@ -71,6 +71,7 @@ static char rcsid[] = "$Revision: 1.10 $
 #include "tbl.h"
 #include "manage.h"
 #include "idb.h"
+#include "condition.h"
 
 #include "image_server.h"
 #include "cget.h"
Index: ctn-3.2.0~dfsg/apps/image_server/parse.c
===================================================================
--- ctn-3.2.0~dfsg.orig/apps/image_server/parse.c
+++ ctn-3.2.0~dfsg/apps/image_server/parse.c
@@ -49,7 +49,6 @@ static char rcsid[] = "$Revision: 1.17 $
 
 #include "ctn_os.h"
 
-#if 0
 #include <stdio.h>
 #include <string.h>
 #include <errno.h>
@@ -57,7 +56,6 @@ static char rcsid[] = "$Revision: 1.17 $
 #include <stdarg.h>
 #include <ctype.h>
 #include <sys/types.h>
-#endif
 
 
 #include "dicom.h"
@@ -69,6 +67,7 @@ static char rcsid[] = "$Revision: 1.17 $
 #include "tbl.h"
 #include "manage.h"
 #include "idb.h"
+#include "condition.h"
 
 #include "image_server.h"
 
Index: ctn-3.2.0~dfsg/apps/image_server/fillImageDB.c
===================================================================
--- ctn-3.2.0~dfsg.orig/apps/image_server/fillImageDB.c
+++ ctn-3.2.0~dfsg/apps/image_server/fillImageDB.c
@@ -82,6 +82,7 @@ static char rcsid[] = "$Revision: 1.11 $
 #include "tbl.h"
 #include "manage.h"
 #include "idb.h"
+#include "condition.h"
 
 #include "image_server.h"
 
Index: ctn-3.2.0~dfsg/apps/print_server_display/print_server_display.c
===================================================================
--- ctn-3.2.0~dfsg.orig/apps/print_server_display/print_server_display.c
+++ ctn-3.2.0~dfsg/apps/print_server_display/print_server_display.c
@@ -32,6 +32,7 @@
 /* Copyright marker.  Copyright will be inserted above.  Do not remove */
 #include <stdio.h>
 #include <stdlib.h>
+#include <unistd.h>
 #ifdef ATHENA
 #include <X11/Intrinsic.h>
 #include <X11/StringDefs.h>
Index: ctn-3.2.0~dfsg/apps/print_server_display/display_prn.c
===================================================================
--- ctn-3.2.0~dfsg.orig/apps/print_server_display/display_prn.c
+++ ctn-3.2.0~dfsg/apps/print_server_display/display_prn.c
@@ -35,6 +35,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
 #include        <X11/Xlib.h>
 #include        <X11/Xutil.h>
 /*#include        <X11/Xos.h>*/
Index: ctn-3.2.0~dfsg/apps/ris_gateway/ris_gateway.c
===================================================================
--- ctn-3.2.0~dfsg.orig/apps/ris_gateway/ris_gateway.c
+++ ctn-3.2.0~dfsg/apps/ris_gateway/ris_gateway.c
@@ -50,6 +50,7 @@ static char rcsid[] = "$Revision: 1.6 $
 #include "tbl.h"
 #include "manage.h"
 #include "fis.h"
+#include "condition.h"
 
 #include "ris_gateway.h"
 
Index: ctn-3.2.0~dfsg/apps/ris_gateway/association.c
===================================================================
--- ctn-3.2.0~dfsg.orig/apps/ris_gateway/association.c
+++ ctn-3.2.0~dfsg/apps/ris_gateway/association.c
@@ -40,6 +40,7 @@ static char rcsid[] = "$Revision: 1.4 $
 #include "dicom_services.h"
 #include "manage.h"
 #include "fis.h"
+#include "condition.h"
 
 #include "ris_gateway.h"
 
Index: ctn-3.2.0~dfsg/apps/ris_gateway/procevent.c
===================================================================
--- ctn-3.2.0~dfsg.orig/apps/ris_gateway/procevent.c
+++ ctn-3.2.0~dfsg/apps/ris_gateway/procevent.c
@@ -68,6 +68,7 @@ static char rcsid[] = "$Revision: 1.6 $
 #include "tbl.h"
 #include "manage.h"
 #include "fis.h"
+#include "condition.h"
 
 #include "ris_gateway.h"
 extern LST_HEAD *eventList;
@@ -538,7 +539,7 @@ insertNewResults(GATEWAY_EVENT * e, DUL_
 	}
 	return rtnCond;
     }
-    COND_PopCondition();
+    COND_PopCondition(TRUE); /*passing anything is better than passing nothing*/
 
     cond = FIS_Insert(f, FIS_K_RESULTS, resultsPtr);
     if (cond != FIS_NORMAL) {
@@ -596,7 +597,7 @@ insertNewInterpretation(GATEWAY_EVENT *
 	}
 	return rtnCond;
     }
-    COND_PopCondition();
+    COND_PopCondition(TRUE); /*passing anything is better than passing nothing*/
 
     if ((interpretationPtr->Flag & FIS_K_INTERP_INTTYPID) == 0) {
 	strcpy(interpretationPtr->IntTypID, "REPORT");
Index: ctn-3.2.0~dfsg/apps/ris_gateway/requests.c
===================================================================
--- ctn-3.2.0~dfsg.orig/apps/ris_gateway/requests.c
+++ ctn-3.2.0~dfsg/apps/ris_gateway/requests.c
@@ -41,6 +41,7 @@ static char rcsid[] = "$Revision: 1.5 $
 #include "tbl.h"
 #include "manage.h"
 #include "fis.h"
+#include "condition.h"
 
 #include "ris_gateway.h"
 
@@ -61,6 +62,11 @@ echoCallback(MSG_C_ECHO_REQ * echoReques
 	     DUL_PRESENTATIONCONTEXT * pc);
 static CTNBOOLEAN silent = FALSE;
 static CTNBOOLEAN waitFlag = FALSE;
+CONDITION
+NEventReportRequest(DUL_ASSOCIATESERVICEPARAMETERS * params,
+		    DUL_ASSOCIATIONKEY ** association, DMAN_HANDLE ** dman,
+	   DUL_PRESENTATIONCONTEXT * ctx, MSG_N_EVENT_REPORT_REQ ** request,
+		    FIS_HANDLE ** fis);
 
 
 /* serviceRequests
Index: ctn-3.2.0~dfsg/apps/send_study/send_study.c
===================================================================
--- ctn-3.2.0~dfsg.orig/apps/send_study/send_study.c
+++ ctn-3.2.0~dfsg/apps/send_study/send_study.c
@@ -63,6 +63,12 @@ static void openControl(char *controlDat
 static LST_HEAD *
 selectImages(IDB_HANDLE ** h, const char *patientID,
 	     const char *studyInstanceUID, const char *accessionNumber);
+CONDITION
+establishSendAssociation(DUL_NETWORKKEY ** networkKey,
+                         LST_HEAD * queryList, char *moveDestination,
+                         DMAN_HANDLE ** handle,
+                         DUL_ASSOCIATIONKEY ** sendAssociation,
+                         DUL_ASSOCIATESERVICEPARAMETERS * params);
 
 static DUL_ASSOCIATESERVICEPARAMETERS *
 createAssociationParameters()
Index: ctn-3.2.0~dfsg/apps/snp_to_files/snp_to_files.c
===================================================================
--- ctn-3.2.0~dfsg.orig/apps/snp_to_files/snp_to_files.c
+++ ctn-3.2.0~dfsg/apps/snp_to_files/snp_to_files.c
@@ -70,6 +70,7 @@ static char rcsid[] = "$Revision: 1.9 $
 #endif
 #include <sys/stat.h>
 #include <fcntl.h>
+#include <unistd.h>
 
 #include "dicom.h"
 #include "ctnthread.h"
Index: ctn-3.2.0~dfsg/apps/storage_commit/storage_commit.c
===================================================================
--- ctn-3.2.0~dfsg.orig/apps/storage_commit/storage_commit.c
+++ ctn-3.2.0~dfsg/apps/storage_commit/storage_commit.c
@@ -74,7 +74,16 @@ insertDBRecords(FIS_HANDLE ** handle, co
 static void
 sendImages(LST_HEAD * imageList, char *destinationAETitle,
 	   DMAN_HANDLE ** dmanHandle);
-
+CONDITION
+establishAssociation(DUL_NETWORKKEY ** networkKey,
+                     char *destination,
+                     DMAN_HANDLE ** handle,
+                     DUL_ASSOCIATIONKEY ** sendAssociation,
+                     DUL_ASSOCIATESERVICEPARAMETERS * params);
+CONDITION
+sendStorageCommitRequest(FIS_HANDLE ** fisHandle, char *transactionUID,
+                         DUL_ASSOCIATIONKEY ** association,
+                         DUL_ASSOCIATESERVICEPARAMETERS * params);
 
 static void
 loadTitleAddressParameters(DUL_ASSOCIATESERVICEPARAMETERS * params,
Index: ctn-3.2.0~dfsg/apps/storage_commit/requests.c
===================================================================
--- ctn-3.2.0~dfsg.orig/apps/storage_commit/requests.c
+++ ctn-3.2.0~dfsg/apps/storage_commit/requests.c
@@ -73,6 +73,7 @@ static char rcsid[] = "$Revision: 1.2 $
 #include "manage.h"
 #include "idb.h"
 #include "fis.h"
+#include "nevent.h"
 
 #include "storage_commit.h"
 
Index: ctn-3.2.0~dfsg/apps/storage_commit/nevent.c
===================================================================
--- ctn-3.2.0~dfsg.orig/apps/storage_commit/nevent.c
+++ ctn-3.2.0~dfsg/apps/storage_commit/nevent.c
@@ -71,6 +71,7 @@ static char rcsid[] = "$Revision: 1.2 $
 #include "idb.h"
 #include "fis.h"
 #include "dicom_sq.h"
+#include "utility.h"
 
 #include "storage_commit.h"
 #include "nevent.h"