sort includes and remove two bogus whitelines.

git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@597 7f574dfc-610e-0410-a909-a81674777703

diff --git a/src/mail.c b/src/mail.c
index baf7741..a83a03b 100644 (file)
--- a/src/mail.c
+++ b/src/mail.c
@@ -6,13 +6,15 @@
  *  $Id$
  */
 
-#include "conky.h"
-#include <stdio.h>
-#include <string.h>
-#include <errno.h>
-#include <sys/time.h>
 #include <sys/stat.h>
+#include <sys/time.h>
+
 #include <dirent.h>
+#include <errno.h>
+#include <stdio.h>
+#include <string.h>
+
+#include "conky.h"
 
 char *current_mail_spool;
 
@@ -105,8 +107,6 @@ void update_mail_count()
        }
 #endif
        /* mbox format */
-
-
        if (buf.st_mtime != last_mail_mtime) {
                /* yippee, modification time has changed, let's read mail count! */
                static int rep;

diff --git a/src/mixer.c b/src/mixer.c
index 7b4ce24..3c85ffd 100644 (file)
--- a/src/mixer.c
+++ b/src/mixer.c
@@ -6,12 +6,14 @@
  *  $Id$
  */
 
-#include "conky.h"
-#include <string.h>
-#include <stdlib.h>
+#include <sys/ioctl.h>
+
 #include <errno.h>
 #include <fcntl.h>
-#include <sys/ioctl.h>
+#include <string.h>
+#include <stdlib.h>
+
+#include "conky.h"
 
 #ifdef HAVE_LINUX_SOUNDCARD_H
 #include <linux/soundcard.h>

diff --git a/src/mldonkey.c b/src/mldonkey.c
index 8f4381a..45f37b0 100644 (file)
--- a/src/mldonkey.c
+++ b/src/mldonkey.c
@@ -1,11 +1,13 @@
-#include "conky.h"
-#include <string.h>
-#include <unistd.h>
+
+#include <arpa/inet.h>
+
 #include <errno.h>
-#include <netdb.h>
 #include <fcntl.h>
-#include <arpa/inet.h>
+#include <netdb.h>
+#include <string.h>
+#include <unistd.h>
 
+#include "conky.h"
 
 int64 buf_to_int(char *buf, int pos, int size);
 void int_to_buf(int64 i, char *buf, int pos, int size);