1 files changed, 35 insertions, 44 deletions

diff --git a/contrib/libf2c/libI77/fmt.h b/contrib/libf2c/libI77/fmt.h
index 6197e76ed5a4..bcd84cee40ae 100644
--- a/contrib/libf2c/libI77/fmt.h
+++ b/contrib/libf2c/libI77/fmt.h
@@ -1,8 +1,14 @@
 struct syl
-{	int op;
-	int p1;
-	union { int i[2]; char *s;} p2;
-	};
+{
+  int op;
+  int p1;
+  union
+  {
+    int i[2];
+    char *s;
+  }
+  p2;
+};
 #define RET1 1
 #define REVERT 2
 #define GOTO 3
@@ -39,45 +45,34 @@ struct syl
 #define OM 34
 #define Z 35
 #define ZM 36
-extern int f__pc,f__parenlvl,f__revloc;
+extern int f__pc, f__parenlvl, f__revloc;
 typedef union
-{	real pf;
-	doublereal pd;
-} ufloat;
+{
+  real pf;
+  doublereal pd;
+}
+ufloat;
 typedef union
-{	short is;
-#ifndef KR_headers
-	signed
-#endif
-		char ic;
-	integer il;
+{
+  short is;
+  signed char ic;
+  integer il;
 #ifdef Allow_TYQUAD
-	longint ili;
-#endif
-} Uint;
-#ifdef KR_headers
-extern int (*f__doed)(),(*f__doned)();
-extern int (*f__dorevert)();
-extern int rd_ed(),rd_ned();
-extern int w_ed(),w_ned();
-#else
-#ifdef __cplusplus
-extern "C" {
-#endif
-extern int (*f__doed)(struct syl*, char*, ftnlen),(*f__doned)(struct syl*);
-extern int (*f__dorevert)(void);
-extern void fmt_bg(void);
-extern int pars_f(char*);
-extern int rd_ed(struct syl*, char*, ftnlen),rd_ned(struct syl*);
-extern int w_ed(struct syl*, char*, ftnlen),w_ned(struct syl*);
-extern int wrt_E(ufloat*, int, int, int, ftnlen);
-extern int wrt_F(ufloat*, int, int, ftnlen);
-extern int wrt_L(Uint*, int, ftnlen);
-#ifdef __cplusplus
-	}
+  longint ili;
 #endif
-#endif
-extern flag f__cblank,f__cplus,f__workdone, f__nonl;
+}
+Uint;
+extern int (*f__doed) (struct syl *, char *, ftnlen),
+  (*f__doned) (struct syl *);
+extern int (*f__dorevert) (void);
+extern void fmt_bg (void);
+extern int pars_f (char *);
+extern int rd_ed (struct syl *, char *, ftnlen), rd_ned (struct syl *);
+extern int w_ed (struct syl *, char *, ftnlen), w_ned (struct syl *);
+extern int wrt_E (ufloat *, int, int, int, ftnlen);
+extern int wrt_F (ufloat *, int, int, ftnlen);
+extern int wrt_L (Uint *, int, ftnlen);
+extern flag f__cblank, f__cplus, f__workdone, f__nonl;
 extern char *f__fmtbuf;
 extern int f__fmtlen;
 extern int f__scale;
@@ -94,8 +89,4 @@ extern int f__cursor;
 #define TYQUAD 14
 #endif
 
-#ifdef KR_headers
-extern char *f__icvt();
-#else
-extern char *f__icvt(longint, int*, int*, int);
-#endif
+extern char *f__icvt (longint, int *, int *, int);