Improve type compatibility and enable
ANSI C prototypes.
---
cde/lib/csa/Imakefile | 6 ------
cde/lib/csa/agent.c | 2 +-
cde/lib/csa/agent.wrapbegin | 8 --------
cde/lib/csa/agent.wrapend | 7 -------
cde/lib/csa/agent.x | 2 +-
cde/lib/csa/free.h | 1 +
6 files changed, 3 insertions(+), 23 deletions(-)
diff --git a/cde/lib/csa/Imakefile b/cde/lib/csa/Imakefile
index fccccdc..d64baee 100644
--- 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 3c84a44..57b9706 100644
--- 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 b11af6a..b263e17 100644
--- 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 7e9615c..015de29 100644
--- 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 fdf014b..761f157 100644
--- 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 fca4299..dae1274 100644
--- 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);
--
1.7.9.2
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
cdesktopenv-devel mailing list
cdesktopenv-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel
