ps2pkm: Include Autoconf generated headers first

git-svn-id: svn://tug.org/texlive/trunk@31032 c570f23f-e606-0410-a88d-b1316a301751

9 files changed, 18 insertions, 13 deletions

diff --git a/Build/source/texk/ps2pkm/ChangeLog b/Build/source/texk/ps2pkm/ChangeLog
index 35de344561c..073f4c885a5 100644
--- a/Build/source/texk/ps2pkm/ChangeLog
+++ b/Build/source/texk/ps2pkm/ChangeLog
@@ -1,3 +1,8 @@
+2013-06-28  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* encoding.c, filenames.c, fontfcn.c, mag.c, pfb2pfa.c, pkout.c,
+	ps2pk.c, scanfont.c: Include Autoconf generated headers first.
+
 2012-11-20  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* Makefile.am: Avoid use of deprecated INCLUDES.
diff --git a/Build/source/texk/ps2pkm/encoding.c b/Build/source/texk/ps2pkm/encoding.c
index df03bac94ce..a55184a65b9 100644
--- a/Build/source/texk/ps2pkm/encoding.c
+++ b/Build/source/texk/ps2pkm/encoding.c
@@ -19,11 +19,11 @@
  *             Version 1.4 (December 1993)
  */
 
+#include "basics.h"
 #include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "basics.h"
 
 char *my_string(char *);
 void remove_string();
diff --git a/Build/source/texk/ps2pkm/filenames.c b/Build/source/texk/ps2pkm/filenames.c
index bc4934d7150..e1a3164c042 100644
--- a/Build/source/texk/ps2pkm/filenames.c
+++ b/Build/source/texk/ps2pkm/filenames.c
@@ -6,16 +6,16 @@
  * VERSION: 1.5 (September 1995)
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <ctype.h>
-#include <string.h>
-
 #ifdef KPATHSEA
 #include <kpathsea/kpathsea.h>
 #include <c-auto.h>
 #endif
 
+#include <stdio.h>
+#include <stdlib.h>
+#include <ctype.h>
+#include <string.h>
+
 #include "basics.h"	/* basic definitions and fatal() */
 
 /* for those systems that don't provide an ANSI strchr() */
diff --git a/Build/source/texk/ps2pkm/fontfcn.c b/Build/source/texk/ps2pkm/fontfcn.c
index d3dd4285196..4d726d3a220 100644
--- a/Build/source/texk/ps2pkm/fontfcn.c
+++ b/Build/source/texk/ps2pkm/fontfcn.c
@@ -29,9 +29,9 @@
  */
 /* Author: Katherine A. Hitchcock    IBM Almaden Research Laboratory */
  
+#include "t1imager.h"
 #include <stdio.h>
 #include <string.h>
-#include "t1imager.h"
 #include "util.h"
 #include "fontfcn.h"
 #include "fontmisc.h"
diff --git a/Build/source/texk/ps2pkm/mag.c b/Build/source/texk/ps2pkm/mag.c
index e31a8272b87..49df48259f1 100644
--- a/Build/source/texk/ps2pkm/mag.c
+++ b/Build/source/texk/ps2pkm/mag.c
@@ -68,6 +68,8 @@
  *	rcpt@urc.tue.nl
  */
 
+#include "basics.h"	/* fatal() */
+
 #include <ctype.h> 
 #include <math.h>
 #include <stdarg.h> 
@@ -78,8 +80,6 @@
 #include <fcntl.h>
 #endif
 
-#include "basics.h"	/* fatal() */
-
 int invert = 0;
 float DPI = 300.0;
 
diff --git a/Build/source/texk/ps2pkm/pfb2pfa.c b/Build/source/texk/ps2pkm/pfb2pfa.c
index a0f982969e0..48d00467aab 100644
--- a/Build/source/texk/ps2pkm/pfb2pfa.c
+++ b/Build/source/texk/ps2pkm/pfb2pfa.c
@@ -17,9 +17,9 @@
  *	Piet Tutelaers (rcpt@urc.tue.nl)
  */
 
+#include "basics.h"	/* basic definitions and fatal() */
 #include <stdarg.h>
 #include <stdio.h>
-#include "basics.h"	/* basic definitions and fatal() */
 #include "filenames.h"  /* newname() */
 
 #if defined(MSDOS) || defined(DOSISH)
diff --git a/Build/source/texk/ps2pkm/pkout.c b/Build/source/texk/ps2pkm/pkout.c
index 84b57a8f274..1f21f80ffb8 100644
--- a/Build/source/texk/ps2pkm/pkout.c
+++ b/Build/source/texk/ps2pkm/pkout.c
@@ -26,10 +26,10 @@
 #define DPI	72.27
 #define MIN(a,b) ( (a<b)? (a): (b))
 
+#include "basics.h"	/* definitions and fatal() */
 #include <stdio.h>
 #include <stdarg.h>	/* va_start(), va_end() */
 #include <stdlib.h>	/* malloc() */
-#include "basics.h"	/* definitions and fatal() */
 #include "pkout.h"
 
 #undef DEBUG
diff --git a/Build/source/texk/ps2pkm/ps2pk.c b/Build/source/texk/ps2pkm/ps2pk.c
index 7574650425d..a6fb83d89ed 100644
--- a/Build/source/texk/ps2pkm/ps2pk.c
+++ b/Build/source/texk/ps2pkm/ps2pk.c
@@ -181,6 +181,7 @@
  *	rcpt@urc.tue.nl
  */
 
+#include "basics.h"	/* basic definitions and fatal() */
 #include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -189,7 +190,6 @@
 /* 
 #include "PSres.h"	
 */
-#include "basics.h"	/* basic definitions and fatal() */
 #include "filenames.h"	/* newname(), extension(), ps_resource() */
 #include "psearch.h"	/* path search functions */
 #include "pkout.h"	/* PK output functions */
diff --git a/Build/source/texk/ps2pkm/scanfont.c b/Build/source/texk/ps2pkm/scanfont.c
index e63343d5704..889cbb6215c 100644
--- a/Build/source/texk/ps2pkm/scanfont.c
+++ b/Build/source/texk/ps2pkm/scanfont.c
@@ -29,8 +29,8 @@
  */
 /* Author: Katherine A. Hitchcock    IBM Almaden Research Laboratory */
  
-#include <string.h>
 #include "types.h"
+#include <string.h>
 
 #include "t1stdio.h"
 #include "util.h"