lib/csa: Use ANSI C prototypes

Improve type compatibility and enable
ANSI C prototypes.

diff --git a/cde/lib/csa/Imakefile b/cde/lib/csa/Imakefile
index fccccdc8aa90f3696c8accc1337b8e4af7d52f71..d64baee2598ee5195434dcb08e8f5efadfa4234b 100644 (file)
--- a/cde/lib/csa/Imakefile
+++ b/cde/lib/csa/Imakefile
@@ -105,12 +105,6 @@ rtable3_clnt.c rtable3_xdr.c: rtable3.h namechange1.sed namechange2.sed
 rtable2_clnt.c rtable2_xdr.c: rtable3.h namechange1.sed namechange2.sed
 agent_xdr.c agent.c: agent.h
 
-#ifdef LinuxArchitecture
-EXTRASED=sed -e 's/update_failed.*=.*1,.*/update_failed = 1/g' |
-#else
-EXTRASED=
-#endif
-
 agent.h:
        $(RM) $@
        cat agent.wrapbegin > agent.h

diff --git a/cde/lib/csa/agent.c b/cde/lib/csa/agent.c
index 3c84a4499beb26f5f874040eeb95b6c7f67c1111..57b970610e36f9d25aaa10b0a330275ea623842b 100644 (file)
--- a/cde/lib/csa/agent.c
+++ b/cde/lib/csa/agent.c
@@ -296,7 +296,7 @@ _DtCm_process_updates()
  */
  
 Update_Status *
-_DtCm_update_callback_1(Table_Res_4 *t, void *dummy)
+_DtCm_update_callback_1(Table_Res_4 *t, _DtCm_Connection *conn)
 {
        static Update_Status status = update_succeeded;
        _CallbackInfo *cbi;

diff --git a/cde/lib/csa/agent.wrapbegin b/cde/lib/csa/agent.wrapbegin
index b11af6a217430309f3038ff65c0da3fd2ac0160b..b263e17845a1d5ddd53d351d6b7fd7f731847e38 100644 (file)
--- a/cde/lib/csa/agent.wrapbegin
+++ b/cde/lib/csa/agent.wrapbegin
@@ -4,11 +4,3 @@
 #if defined(HPUX)
 #include <rpc/types.h>
 #endif /* HPUX */
-
-#if defined(linux) || defined(CSRG_BASED)
-# if defined __STDC__
-#  define REDEFINE_STDC
-#  undef __STDC__
-# endif
-#endif /* linux */
-

diff --git a/cde/lib/csa/agent.wrapend b/cde/lib/csa/agent.wrapend
index 7e9615cce017787024b8a6bb12c50ec97ebad64f..015de29249a27d6be8620be8c49591bc9a9d650d 100644 (file)
--- a/cde/lib/csa/agent.wrapend
+++ b/cde/lib/csa/agent.wrapend
@@ -3,10 +3,3 @@
 #define hpux
 #endif
 #endif
-
-#if defined(linux)
-# if defined REDEFINE_STDC
-#  undef REDEFINE_STDC
-#  define __STDC__
-# endif
-#endif /* linux */

diff --git a/cde/lib/csa/agent.x b/cde/lib/csa/agent.x
index fdf014b7b7603e64c51bac0149e235391982b691..761f1579f29719ac3a61660080db51d3e29b08a8 100644 (file)
--- a/cde/lib/csa/agent.x
+++ b/cde/lib/csa/agent.x
@@ -32,6 +32,6 @@ enum Update_Status {
 */
 program AGENTPROG {
         version AGENTVERS {
-                Update_Status update_callback(Table_Res) = 1;
+                Update_Status update_callback(Table_Res_4) = 1;
         }=1;
 }=00;

diff --git a/cde/lib/csa/free.h b/cde/lib/csa/free.h
index fca429974df0b54b8578f7f81eefd90bcc5f1b49..dae1274219af9c5200c66750d4acbcd133f5833b 100644 (file)
--- a/cde/lib/csa/free.h
+++ b/cde/lib/csa/free.h
@@ -33,6 +33,7 @@
 
 #include <EUSCompat.h>
 #include "ansi_c.h"
+#include <sys/types.h>
 
 extern CSA_calendar_user *_DtCm_alloc_calendar_users(uint num_elem);