debian/cdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dtcm: include <iso8601.h> of libcsa to resolve type mismatch

Browse Source
This commit is contained in:
OBATA Akio
2021-10-12 16:18:45 +09:00
parent 008bcba766
commit 2c9db8fe37
7 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cde/programs/dtcm/dtcm/calendar.h
View File

@@ -54,6 +54,7 @@
#include <X11/Intrinsic.h> #include <X11/Intrinsic.h>
#include <csa.h> #include <csa.h>
#include <iso8601.h>
#include <Dt/MsgCatP.h> #include <Dt/MsgCatP.h>
#include <Xm/Xm.h> #include <Xm/Xm.h>
#include "util.h" #include "util.h"
@@ -305,8 +306,6 @@ typedef struct {
} Calendar; } Calendar;
extern Calendar *calendar; extern Calendar *calendar;
extern int _csa_iso8601_to_tick(char *, time_t*);
extern int _csa_tick_to_iso8601(time_t, char *);
#define MAXBUFLEN 4096 #define MAXBUFLEN 4096

1
cde/programs/dtcm/dtcm/format.c
View File

@@ -59,6 +59,7 @@ static char sccsid[] = "@(#)format.c 1.27 95/01/19 Copyr 1991 Sun Microsystems,
#endif #endif
#include <Xm/Xm.h> #include <Xm/Xm.h>
#include <csa.h> #include <csa.h>
#include <iso8601.h>
#include "util.h" #include "util.h"
#include "cm_tty.h" #include "cm_tty.h"
#include "timeops.h" #include "timeops.h"

1
cde/programs/dtcm/dtcm/group_editor.c
View File

@@ -71,7 +71,6 @@
#endif /* SVR4 */ #endif /* SVR4 */
#define ACCESS_NAME_LEN 25 #define ACCESS_NAME_LEN 25
extern int _csa_duration_to_iso8601(int, char *);
extern void scrub_attr_list(Dtcm_appointment *); extern void scrub_attr_list(Dtcm_appointment *);
extern boolean_t compare_repeat_info(Dtcm_appointment *, RFP *, CSA_session_handle, int); extern boolean_t compare_repeat_info(Dtcm_appointment *, RFP *, CSA_session_handle, int);
extern void change_rule_for_this_one_only(Calendar *, Dtcm_appointment *, Dtcm_appointment *); extern void change_rule_for_this_one_only(Calendar *, Dtcm_appointment *, Dtcm_appointment *);

4
cde/programs/dtcm/dtcm/reminders.c
View File

@@ -60,15 +60,13 @@
#include <Xm/Text.h> #include <Xm/Text.h>
#include <Xm/ToggleBG.h> #include <Xm/ToggleBG.h>
#include <Xm/ToggleB.h> #include <Xm/ToggleB.h>
#include <iso8601.h>
#include "reminders.h" #include "reminders.h"
#include "props.h" #include "props.h"
#include "help.h" #include "help.h"
#include "props_pu.h" #include "props_pu.h"
#include "util.h" #include "util.h"
extern int _csa_duration_to_iso8601(int, char *);
extern int _csa_iso8601_to_duration(char *, int*);
/******************************************************************************* /*******************************************************************************
** **
** Static functions local to reminders.c only ** Static functions local to reminders.c only

2
cde/programs/dtcm/dtcm/reminders.h
View File

@@ -79,7 +79,7 @@ typedef enum {
typedef struct { typedef struct {
Boolean selected; Boolean selected;
Time_scope_menu_op scope; Time_scope_menu_op scope;
int scope_val; time_t scope_val;
} Reminders_val; } Reminders_val;
typedef struct { typedef struct {

6
cde/programs/dtcm/libDtCmP/cm_tty.c
View File

@@ -60,6 +60,7 @@ static char sccsid[] = "@(#)cm_tty.c 1.91 95/07/27 Copyr 1993 Sun Microsystems,
#include <Dt/MsgCatP.h> #include <Dt/MsgCatP.h>
#include <sys/param.h> #include <sys/param.h>
#include <sys/types.h> #include <sys/types.h>
#include <iso8601.h>
#include "cm_tty.h" #include "cm_tty.h"
#include "getdate.h" #include "getdate.h"
#include "util.h" #include "util.h"
@@ -157,11 +158,6 @@ nl_catd catd_global;
static char *new_appt_begin_delimiter = NULL; static char *new_appt_begin_delimiter = NULL;
static char *new_appt_end_delimiter = NULL; static char *new_appt_end_delimiter = NULL;
extern int _csa_iso8601_to_tick(char *, time_t*);
extern int _csa_tick_to_iso8601(time_t, char *);
extern int _csa_iso8601_to_duration(char *, int*);
extern int _csa_duration_to_iso8601(int, char *);
/******************************************************************************* /*******************************************************************************
** **
** Static functions ** Static functions

3
cde/programs/dtcm/libDtCmP/util.c
View File

@@ -84,8 +84,7 @@ extern int errno;
#include "util.h" #include "util.h"
#include "cm_tty.h" #include "cm_tty.h"
extern int _csa_tick_to_iso8601(time_t, char *); #include <iso8601.h>
extern int _csa_iso8601_to_tick(char *, time_t*);
extern FILE *popen(const char *, const char *); extern FILE *popen(const char *, const char *);
extern int pclose(FILE *); extern int pclose(FILE *);