From acfbad9b16941d1681af1a2a7715ebf479e4fd88 Mon Sep 17 00:00:00 2001
From: Brenden Matthews <brenden@diddyinc.com>
Date: Wed, 3 Mar 2010 11:21:41 -0800
Subject: [PATCH] Build fix due to bad include ordering.

---
 src/conky.c       |    8 +++++---
 src/i8k.c         |    4 ++--
 src/iconv_tools.c |    2 +-
 src/proc.c        |    2 +-
 src/user.c        |    2 +-
 5 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/conky.c b/src/conky.c
index b08df7c..500261b 100644
--- a/src/conky.c
+++ b/src/conky.c
@@ -4508,7 +4508,7 @@ static int do_config_step(int *line, FILE *fp, char *buf, char **name, char **va
 }
 
 #ifdef X11
-void setalignment(int* text_alignment, unsigned int windowtype, const char* value, const char *f, int line, char setbyconffile) {
+void setalignment(int* ltext_alignment, unsigned int windowtype, const char* value, const char *f, int line, char setbyconffile) {
 #ifdef OWN_WINDOW
 	if (windowtype == TYPE_DOCK) {
 		NORM_ERR("alignment is disabled when own_window_type is dock");
@@ -4522,7 +4522,7 @@ void setalignment(int* text_alignment, unsigned int windowtype, const char* valu
 				CONF_ERR;
 			} else NORM_ERR("'%s' is not a alignment setting", value);
 		} else {
-			*text_alignment = a;
+			*ltext_alignment = a;
 		}
 	} else if(setbyconffile == true) {
 		CONF_ERR;
@@ -5587,7 +5587,9 @@ static const struct option longopts[] = {
 	{ 0, 0, 0, 0 }
 };
 
-void set_current_config() {
+void set_current_config(void);
+void set_current_config(void)
+{
 	/* check if specified config file is valid */
 	if (current_config) {
 		struct stat sb;
diff --git a/src/i8k.c b/src/i8k.c
index 5bfbd05..822c0c7 100644
--- a/src/i8k.c
+++ b/src/i8k.c
@@ -32,9 +32,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "logging.h"
-#include "temphelper.h"
 #include "text_object.h"
+#include "temphelper.h"
+#include "logging.h"
 
 struct {
 	char *version;
diff --git a/src/iconv_tools.c b/src/iconv_tools.c
index 6dc129c..f2a8e5d 100644
--- a/src/iconv_tools.c
+++ b/src/iconv_tools.c
@@ -29,8 +29,8 @@
  */
 
 #include "config.h"
-#include "logging.h"
 #include "text_object.h"
+#include "logging.h"
 #include <iconv.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/proc.c b/src/proc.c
index 218393e..63855c2 100644
--- a/src/proc.c
+++ b/src/proc.c
@@ -28,8 +28,8 @@
  *
  */
 
-#include <logging.h>
 #include "conky.h"
+#include "logging.h"
 #include "proc.h"
 #include <unistd.h>
 #include <ctype.h>
diff --git a/src/user.c b/src/user.c
index 7c326c0..6af54f4 100644
--- a/src/user.c
+++ b/src/user.c
@@ -28,11 +28,11 @@
  *
  */
 
-#include <logging.h>
 #include <pwd.h>
 #include <grp.h>
 #include <errno.h>
 #include "conky.h"
+#include "logging.h"
 
 void print_uid_name(struct text_object *obj, char *p, int p_max_size) {
 	struct passwd *pw;
-- 
1.7.9.5