From c1c34ae44360f59eaf8e992e36ac66a22e936c85 Mon Sep 17 00:00:00 2001 From: Nikolas Garofil Date: Sat, 21 Jun 2008 14:18:44 +0000 Subject: [PATCH] 'inline' removed from functions that are called from different files git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1187 7f574dfc-610e-0410-a909-a81674777703 --- src/conky.c | 6 +++--- src/linux.c | 4 ++-- src/top.c | 2 +- src/x11.c | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/conky.c b/src/conky.c index 8e489b4c..8c6fc52a 100644 --- a/src/conky.c +++ b/src/conky.c @@ -708,7 +708,7 @@ static void new_font(char *buf, char *args) } } #endif -inline void graph_append(struct special_t *graph, double f) +void graph_append(struct special_t *graph, double f) { int i; @@ -6519,7 +6519,7 @@ void set_up_gradient(void) } /* this function returns the next colour between two colours for a gradient */ -inline unsigned long do_gradient(unsigned long first_colour, +unsigned long do_gradient(unsigned long first_colour, unsigned long last_colour) { int tmp_color = 0; @@ -6579,7 +6579,7 @@ inline unsigned long do_gradient(unsigned long first_colour, } /* this function returns the max diff for a gradient */ -inline unsigned long gradient_max(unsigned long first_colour, +unsigned long gradient_max(unsigned long first_colour, unsigned long last_colour) { int red1, green1, blue1; // first colour diff --git a/src/linux.c b/src/linux.c index f9543a98..33954c8b 100644 --- a/src/linux.c +++ b/src/linux.c @@ -313,7 +313,7 @@ void update_gateway_info(void) return; } -inline void update_net_stats(void) +void update_net_stats(void) { FILE *net_dev_fp; static int rep = 0; @@ -1057,7 +1057,7 @@ void get_adt746x_cpu(char *p_client_buffer, size_t client_buffer_size) * Small changes by David Sterba */ #if defined(__i386) || defined(__x86_64) -__inline__ unsigned long long int rdtsc(void) +unsigned long long int rdtsc(void) { unsigned long long int x; diff --git a/src/top.c b/src/top.c index 73116340..828824ee 100644 --- a/src/top.c +++ b/src/top.c @@ -517,7 +517,7 @@ void sp_acopy(struct sorted_process *sp_head, struct process **ar, int max_size) * Results are stored in the cpu,mem arrays in decreasing order[0-9]. * * ****************************************************************** */ -inline void process_find_top(struct process **cpu, struct process **mem) +void process_find_top(struct process **cpu, struct process **mem) { struct sorted_process *spc_head = NULL, *spc_tail = NULL, *spc_cur = NULL; struct sorted_process *spm_head = NULL, *spm_tail = NULL, *spm_cur = NULL; diff --git a/src/x11.c b/src/x11.c index 6c721ae9..4769de9f 100644 --- a/src/x11.c +++ b/src/x11.c @@ -183,7 +183,7 @@ static Window find_desktop_window(Window *p_root, Window *p_desktop) } /* sets background to ParentRelative for the Window and all parents */ -inline void set_transparent_background(Window win) +void set_transparent_background(Window win) { static int colour_set = -1;