Imported Debian patch 1.0.1-1debian/1.0.1-1

1 files changed, 15 insertions, 17 deletions

diff --git a/Meter.c b/Meter.c
index 97b1dc4..b009d66 100644
--- a/Meter.c
+++ b/Meter.c
@@ -5,30 +5,39 @@ Released under the GNU GPL, see the COPYING file
 in the source distribution for its full text.
 */
 
-#include "RichString.h"
 #include "Meter.h"
+
+#include "CPUMeter.h"
+#include "MemoryMeter.h"
+#include "SwapMeter.h"
+#include "TasksMeter.h"
+#include "LoadAverageMeter.h"
+#include "UptimeMeter.h"
+#include "BatteryMeter.h"
+#include "ClockMeter.h"
+#include "HostnameMeter.h"
+#include "RichString.h"
 #include "Object.h"
 #include "CRT.h"
-#include "ListItem.h"
 #include "String.h"
-#include "ProcessList.h"
+#include "ListItem.h"
 
 #include <math.h>
 #include <string.h>
 #include <stdlib.h>
 #include <stdarg.h>
-
-#include "debug.h"
 #include <assert.h>
+#include <time.h>
 
 #ifndef USE_FUNKY_MODES
-#include <time.h>
 #define USE_FUNKY_MODES 1
 #endif
 
 #define METER_BUFFER_LEN 128
 
 /*{
+#include "ListItem.h"
+#include "ProcessList.h"
 
 typedef struct Meter_ Meter;
 typedef struct MeterType_ MeterType;
@@ -96,17 +105,6 @@ typedef enum {
 
 }*/
 
-#include "CPUMeter.h"
-#include "MemoryMeter.h"
-#include "SwapMeter.h"
-#include "TasksMeter.h"
-#include "LoadAverageMeter.h"
-#include "UptimeMeter.h"
-#include "BatteryMeter.h"
-#include "ClockMeter.h"
-#include "HostnameMeter.h"
-
-
 #ifndef MIN
 #define MIN(a,b) ((a)<(b)?(a):(b))
 #endif