use ANSI C function definitions and prototypes

use <stdarg.h> instead of <kpathsea/c-vararg.h>

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

1 files changed, 2 insertions, 75 deletions

diff --git a/Build/source/texk/kpathsea/c-proto.h b/Build/source/texk/kpathsea/c-proto.h
index 05eb46794bb..9912a8fef92 100644
--- a/Build/source/texk/kpathsea/c-proto.h
+++ b/Build/source/texk/kpathsea/c-proto.h
@@ -34,7 +34,8 @@
    definitions.  Cf. <ansidecl.h> from the GNU C library.  P1H(void)
    also works for definitions of routines which take no args.  */
 
-#ifdef HAVE_PROTOTYPES
+/* We now require that the compiler understands prototypes.  We keep
+   these definitions until the macros are not used anymore.  */
 
 #define AA(args) args /* For an arbitrary number; ARGS must be in parens.  */
 
@@ -103,78 +104,4 @@
   (t1 n1, t2 n2, t3 n3, t4 n4, t5 n5, t6 n6, t7 n7, t8 n8, t9 n9, t10 n10, \
    t11 n11, t12 n12, t13 n13, t14 n14, t15 n15, t16 n16, t17 n17)
 
-#else /* not HAVE_PROTOTYPES */
-
-#define AA(args) ()
-    
-#define P1H(p1) ()
-#define P2H(p1, p2) ()
-#define P3H(p1, p2, p3) ()
-#define P4H(p1, p2, p3, p4) ()
-#define P5H(p1, p2, p3, p4, p5) ()
-#define P6H(p1, p2, p3, p4, p5, p6) ()
-#define P7H(p1, p2, p3, p4, p5, p6, p7) ()
-#define P8H(p1, p2, p3, p4, p5, p6, p7, p8) ()
-#define P9H(p1, p2, p3, p4, p5, p6, p7, p8, p9) ()
-#define P10H(p1,p2,p3,p4,p5,p6,p7,p8,p9,p10) ()
-#define P11H(p1,p2,p3,p4,p5,p6,p7,p8,p9,p10,p11) ()
-#define P12H(p1,p2,p3,p4,p5,p6,p7,p8,p9,p10,p11,p12) ()
-#define P13H(p1,p2,p3,p4,p5,p6,p7,p8,p9,p10,p11,p12,p13) ()
-#define P14H(p1,p2,p3,p4,p5,p6,p7,p8,p9,p10,p11,p12,p13,p14) ()
-#define P15H(p1,p2,p3,p4,p5,p6,p7,p8,p9,p10,p11,p12,p13,p14,p15) ()
-#define P16H(p1,p2,p3,p4,p5,p6,p7,p8,p9,p10,p11,p12,p13,p14,p15,p16) ()
-#define P17H(p1,p2,p3,p4,p5,p6,p7,p8,p9,p10,p11,p12,p13,p14,p15,p16,p17) ()
-
-#define P1C(t1,n1) (n1) t1 n1;
-#define P2C(t1,n1, t2,n2) (n1,n2) t1 n1; t2 n2;
-#define P3C(t1,n1, t2,n2, t3,n3) (n1,n2,n3) t1 n1; t2 n2; t3 n3;
-#define P4C(t1,n1, t2,n2, t3,n3, t4,n4) (n1,n2,n3,n4) \
-  t1 n1; t2 n2; t3 n3; t4 n4;
-#define P5C(t1,n1, t2,n2, t3,n3, t4,n4, t5,n5) (n1,n2,n3,n4,n5) \
-  t1 n1; t2 n2; t3 n3; t4 n4; t5 n5;
-#define P6C(t1,n1, t2,n2, t3,n3, t4,n4, t5,n5, t6,n6) (n1,n2,n3,n4,n5,n6) \
-  t1 n1; t2 n2; t3 n3; t4 n4; t5 n5; t6 n6;
-#define P7C(t1,n1, t2,n2, t3,n3, t4,n4, t5,n5, t6,n6, t7,n7) \
-  (n1,n2,n3,n4,n5,n6,n7) \
-  t1 n1; t2 n2; t3 n3; t4 n4; t5 n5; t6 n6; t7 n7;
-#define P8C(t1,n1, t2,n2, t3,n3, t4,n4, t5,n5, t6,n6, t7,n7, t8,n8) \
-  (n1,n2,n3,n4,n5,n6,n7,n8) \
-  t1 n1; t2 n2; t3 n3; t4 n4; t5 n5; t6 n6; t7 n7; t8 n8;
-#define P9C(t1,n1, t2,n2, t3,n3, t4,n4, t5,n5, t6,n6, t7,n7, t8,n8, t9,n9) \
-  (n1,n2,n3,n4,n5,n6,n7,n8,n9) \
-  t1 n1; t2 n2; t3 n3; t4 n4; t5 n5; t6 n6; t7 n7; t8 n8; t9 n9;
-#define P10C(t1,n1,t2,n2,t3,n3,t4,n4,t5,n5,t6,n6,t7,n7,t8,n8,t9,n9,t10,n10) \
-  (n1,n2,n3,n4,n5,n6,n7,n8,n9,n10) \
-   t1 n1; t2 n2; t3 n3; t4 n4; t5 n5; t6 n6; t7 n7; t8 n8; t9 n9; t10 n10;
-#define P11C(t1,n1,t2,n2,t3,n3,t4,n4,t5,n5,t6,n6,t7,n7,t8,n8,t9,n9,t10,n10,t11,n11) \
-  (n1,n2,n3,n4,n5,n6,n7,n8,n9,n10,n11) \
-   t1 n1; t2 n2; t3 n3; t4 n4; t5 n5; t6 n6; t7 n7; t8 n8; t9 n9; t10 n10; \
-   t11 n11;
-#define P12C(t1,n1,t2,n2,t3,n3,t4,n4,t5,n5,t6,n6,t7,n7,t8,n8,t9,n9,t10,n10,t11,n11,t12,n12) \
-  (n1,n2,n3,n4,n5,n6,n7,n8,n9,n10,n11,n12) \
-   t1 n1; t2 n2; t3 n3; t4 n4; t5 n5; t6 n6; t7 n7; t8 n8; t9 n9; t10 n10; \
-   t11 n11; t12 n12;
-#define P13C(t1,n1,t2,n2,t3,n3,t4,n4,t5,n5,t6,n6,t7,n7,t8,n8,t9,n9,t10,n10,t11,n11,t12,n12,t13,n13) \
-  (n1,n2,n3,n4,n5,n6,n7,n8,n9,n10,n11,n12,n13) \
-   t1 n1; t2 n2; t3 n3; t4 n4; t5 n5; t6 n6; t7 n7; t8 n8; t9 n9; t10 n10; \
-   t11 n11; t12 n12; t13 n13;
-#define P14C(t1,n1,t2,n2,t3,n3,t4,n4,t5,n5,t6,n6,t7,n7,t8,n8,t9,n9,t10,n10,t11,n11,t12,n12,t13,n13,t14,n14) \
-  (n1,n2,n3,n4,n5,n6,n7,n8,n9,n10,n11,n12,n13,n14) \
-   t1 n1; t2 n2; t3 n3; t4 n4; t5 n5; t6 n6; t7 n7; t8 n8; t9 n9; t10 n10; \
-   t11 n11; t12 n12; t13 n13; t14 n14;
-#define P15C(t1,n1,t2,n2,t3,n3,t4,n4,t5,n5,t6,n6,t7,n7,t8,n8,t9,n9,t10,n10,t11,n11,t12,n12,t13,n13,t14,n14,t15,n15) \
-  (n1,n2,n3,n4,n5,n6,n7,n8,n9,n10,n11,n12,n13,n14,n15) \
-   t1 n1; t2 n2; t3 n3; t4 n4; t5 n5; t6 n6; t7 n7; t8 n8; t9 n9; t10 n10; \
-   t11 n11; t12 n12; t13 n13; t14 n14; t15 n15;
-#define P16C(t1,n1,t2,n2,t3,n3,t4,n4,t5,n5,t6,n6,t7,n7,t8,n8,t9,n9,t10,n10,t11,n11,t12,n12,t13,n13,t14,n14,t15,n15,t16,n16) \
-  (n1,n2,n3,n4,n5,n6,n7,n8,n9,n10,n11,n12,n13,n14,n15,n16) \
-   t1 n1; t2 n2; t3 n3; t4 n4; t5 n5; t6 n6; t7 n7; t8 n8; t9 n9; t10 n10; \
-   t11 n11; t12 n12; t13 n13; t14 n14; t15 n15; t16 n16;
-#define P17C(t1,n1,t2,n2,t3,n3,t4,n4,t5,n5,t6,n6,t7,n7,t8,n8,t9,n9,t10,n10,t11,n11,t12,n12,t13,n13,t14,n14,t15,n15,t16,n16,t17,n17) \
-  (n1,n2,n3,n4,n5,n6,n7,n8,n9,n10,n11,n12,n13,n14,n15,n16,n17) \
-   t1 n1; t2 n2; t3 n3; t4 n4; t5 n5; t6 n6; t7 n7; t8 n8; t9 n9; t10 n10; \
-   t11 n11; t12 n12; t13 n13; t14 n14; t15 n15; t16 n16; t17 n17;
-
-#endif /* not HAVE_PROTOTYPES */
-
 #endif /* not KPATHSEA_C_PROTO_H */