Merge branch 'misc/include-cleanup'

This should make it easier to read includes.

1 files changed, 18 insertions, 17 deletions

diff --git a/apt-pkg/contrib/error.cc b/apt-pkg/contrib/error.cc
index c06ea8364..0233dfd59 100644
--- a/apt-pkg/contrib/error.cc
+++ b/apt-pkg/contrib/error.cc
@@ -17,17 +17,17 @@
 
 #include <apt-pkg/error.h>
 
-#include <stdarg.h>
-#include <stddef.h>
-#include <list>
+#include <algorithm>
+#include <cstring>
 #include <iostream>
+#include <list>
+#include <string>
 #include <errno.h>
+#include <stdarg.h>
+#include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <string>
-#include <cstring>
-#include <algorithm>
 
 									/*}}}*/
 
@@ -37,20 +37,21 @@
    Per-Thread error object is maintained in much the same manner as libc
    manages errno */
 #if defined(_POSIX_THREADS) && defined(HAVE_PTHREAD)
-	#include <pthread.h>
+#include <pthread.h>
 
-	static pthread_key_t ErrorKey;
-	static void ErrorDestroy(void *Obj) {delete (GlobalError *)Obj;};
-	static void KeyAlloc() {pthread_key_create(&ErrorKey,ErrorDestroy);};
+static pthread_key_t ErrorKey;
+static void ErrorDestroy(void *Obj) { delete (GlobalError *)Obj; };
+static void KeyAlloc() { pthread_key_create(&ErrorKey, ErrorDestroy); };
 
-	GlobalError *_GetErrorObj() {
-		static pthread_once_t Once = PTHREAD_ONCE_INIT;
-		pthread_once(&Once,KeyAlloc);
+GlobalError *_GetErrorObj()
+{
+   static pthread_once_t Once = PTHREAD_ONCE_INIT;
+   pthread_once(&Once, KeyAlloc);
 
-		void *Res = pthread_getspecific(ErrorKey);
-		if (Res == 0)
-			pthread_setspecific(ErrorKey,Res = new GlobalError);
-		return (GlobalError *)Res;
+   void *Res = pthread_getspecific(ErrorKey);
+   if (Res == 0)
+      pthread_setspecific(ErrorKey, Res = new GlobalError);
+   return (GlobalError *)Res;
 	}
 #else
 	GlobalError *_GetErrorObj() {