mirror of
https://github.com/Llewellynvdm/conky.git
synced 2024-12-25 04:06:03 +00:00
struct alignment patch #1812924
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@973 7f574dfc-610e-0410-a909-a81674777703
This commit is contained in:
parent
c69e618c55
commit
441cedd2ad
14
src/conky.c
14
src/conky.c
@ -529,9 +529,9 @@ struct special_t {
|
|||||||
double graph_scale;
|
double graph_scale;
|
||||||
int graph_width;
|
int graph_width;
|
||||||
int scaled;
|
int scaled;
|
||||||
short font_added;
|
|
||||||
unsigned long first_colour; // for graph gradient
|
unsigned long first_colour; // for graph gradient
|
||||||
unsigned long last_colour;
|
unsigned long last_colour;
|
||||||
|
short font_added;
|
||||||
};
|
};
|
||||||
|
|
||||||
/* create specials array on heap instead of stack with introduction of max_specials */
|
/* create specials array on heap instead of stack with introduction of max_specials */
|
||||||
@ -1185,12 +1185,6 @@ enum text_object_type {
|
|||||||
};
|
};
|
||||||
|
|
||||||
struct text_object {
|
struct text_object {
|
||||||
int type;
|
|
||||||
int a, b;
|
|
||||||
long line;
|
|
||||||
unsigned int c, d, e;
|
|
||||||
float f;
|
|
||||||
char global_mode;
|
|
||||||
union {
|
union {
|
||||||
char *s; /* some string */
|
char *s; /* some string */
|
||||||
int i; /* some integer */
|
int i; /* some integer */
|
||||||
@ -1296,6 +1290,12 @@ struct text_object {
|
|||||||
#endif
|
#endif
|
||||||
struct local_mail_s local_mail;
|
struct local_mail_s local_mail;
|
||||||
} data;
|
} data;
|
||||||
|
int type;
|
||||||
|
int a, b;
|
||||||
|
long line;
|
||||||
|
unsigned int c, d, e;
|
||||||
|
float f;
|
||||||
|
char global_mode;
|
||||||
};
|
};
|
||||||
|
|
||||||
struct text_object_list {
|
struct text_object_list {
|
||||||
|
@ -124,9 +124,9 @@ struct net_stat {
|
|||||||
char essid[32];
|
char essid[32];
|
||||||
char bitrate[16];
|
char bitrate[16];
|
||||||
char mode[16];
|
char mode[16];
|
||||||
char ap[18];
|
|
||||||
int link_qual;
|
int link_qual;
|
||||||
int link_qual_max;
|
int link_qual_max;
|
||||||
|
char ap[18];
|
||||||
};
|
};
|
||||||
|
|
||||||
unsigned int diskio_value;
|
unsigned int diskio_value;
|
||||||
@ -153,8 +153,8 @@ struct mail_s { // for imap and pop3
|
|||||||
char pass[128];
|
char pass[128];
|
||||||
char command[1024];
|
char command[1024];
|
||||||
char folder[128];
|
char folder[128];
|
||||||
char secure;
|
|
||||||
timed_thread *p_timed_thread;
|
timed_thread *p_timed_thread;
|
||||||
|
char secure;
|
||||||
} mail;
|
} mail;
|
||||||
|
|
||||||
/*struct cpu_stat {
|
/*struct cpu_stat {
|
||||||
@ -347,9 +347,10 @@ struct information {
|
|||||||
#ifdef TCP_PORT_MONITOR
|
#ifdef TCP_PORT_MONITOR
|
||||||
tcp_port_monitor_collection_t * p_tcp_port_monitor_collection;
|
tcp_port_monitor_collection_t * p_tcp_port_monitor_collection;
|
||||||
#endif
|
#endif
|
||||||
short kflags; /* kernel settings, see enum KFLAG */
|
|
||||||
struct entropy_s entropy;
|
struct entropy_s entropy;
|
||||||
double music_player_interval;
|
double music_player_interval;
|
||||||
|
|
||||||
|
short kflags; /* kernel settings, see enum KFLAG */
|
||||||
};
|
};
|
||||||
|
|
||||||
enum {
|
enum {
|
||||||
|
Loading…
Reference in New Issue
Block a user