From 9321813126821e409516d241805c073635457c8c Mon Sep 17 00:00:00 2001 From: "Kaveh R. Ghazi" Date: Sat, 1 Jun 2002 01:55:57 +0000 Subject: [PATCH] F77_aloc.c, [...]: Delete checks on __cplusplus. * libF77/F77_aloc.c, libF77/exit_.c, libF77/main.c, libF77/s_paus.c, libF77/s_stop.c, libF77/setarg.c, libF77/setsig.c, libF77/sig_die.c, libF77/signal1.h0, libI77/close.c, libI77/dolio.c, libI77/fio.h, libI77/fmt.h, libI77/lio.h: Delete checks on __cplusplus. From-SVN: r54133 --- libf2c/ChangeLog | 8 ++++++++ libf2c/libF77/F77_aloc.c | 6 ------ libf2c/libF77/exit_.c | 6 ------ libf2c/libF77/main.c | 8 -------- libf2c/libF77/s_paus.c | 6 ------ libf2c/libF77/s_stop.c | 6 ------ libf2c/libF77/setarg.c | 4 ---- libf2c/libF77/setsig.c | 8 -------- libf2c/libF77/sig_die.c | 6 ------ libf2c/libF77/signal1.h0 | 5 ----- libf2c/libI77/close.c | 4 ---- libf2c/libI77/dolio.c | 6 ------ libf2c/libI77/fio.h | 6 ------ libf2c/libI77/fmt.h | 6 ------ libf2c/libI77/lio.h | 6 ------ 15 files changed, 8 insertions(+), 83 deletions(-) diff --git a/libf2c/ChangeLog b/libf2c/ChangeLog index a2629f4f1b2..b0c1666374f 100644 --- a/libf2c/ChangeLog +++ b/libf2c/ChangeLog @@ -1,3 +1,11 @@ +Fri May 31 21:54:37 2002 Kaveh R. Ghazi + + * libF77/F77_aloc.c, libF77/exit_.c, libF77/main.c, + libF77/s_paus.c, libF77/s_stop.c, libF77/setarg.c, + libF77/setsig.c, libF77/sig_die.c, libF77/signal1.h0, + libI77/close.c, libI77/dolio.c, libI77/fio.h, libI77/fmt.h, + libI77/lio.h: Delete checks on __cplusplus. + Fri May 31 21:50:01 2002 Kaveh R. Ghazi * libF77/*: Delete KR_headers cruft. diff --git a/libf2c/libF77/F77_aloc.c b/libf2c/libF77/F77_aloc.c index f34bfa07975..8716493aa70 100644 --- a/libf2c/libF77/F77_aloc.c +++ b/libf2c/libF77/F77_aloc.c @@ -7,13 +7,7 @@ static integer memfailure = 3; #include -#ifdef __cplusplus -extern "C" { -#endif extern void G77_exit_0 (integer*); -#ifdef __cplusplus - } -#endif char * F77_aloc(integer Len, char *whence) diff --git a/libf2c/libF77/exit_.c b/libf2c/libF77/exit_.c index 7c361dbd05d..e86d07068b4 100644 --- a/libf2c/libF77/exit_.c +++ b/libf2c/libF77/exit_.c @@ -13,9 +13,6 @@ #undef min #undef max #include -#ifdef __cplusplus -extern "C" { -#endif extern void f_exit(void); void @@ -26,6 +23,3 @@ G77_exit_0 (integer *rc) #endif exit(*rc); } -#ifdef __cplusplus -} -#endif diff --git a/libf2c/libF77/main.c b/libf2c/libF77/main.c index 9f41947b977..131c06ca394 100644 --- a/libf2c/libF77/main.c +++ b/libf2c/libF77/main.c @@ -10,10 +10,6 @@ #define VOID void #endif -#ifdef __cplusplus -extern "C" { -#endif - extern void f_exit(void); #ifndef NO_ONEXIT #define ONEXIT atexit @@ -23,10 +19,6 @@ extern int atexit(void (*)(void)); extern void f_init(void); extern int MAIN__(void); -#ifdef __cplusplus - } -#endif - main(int argc, char **argv) { f_setarg(argc, argv); diff --git a/libf2c/libF77/s_paus.c b/libf2c/libF77/s_paus.c index 3fe256c948c..0f1b1917ab3 100644 --- a/libf2c/libF77/s_paus.c +++ b/libf2c/libF77/s_paus.c @@ -9,9 +9,6 @@ #undef min #undef max #include -#ifdef __cplusplus -extern "C" { -#endif extern int getpid(void), isatty(int), pause(void); extern VOID f_exit(Void); @@ -69,7 +66,4 @@ s_paus(char *s, ftnlen n) fprintf(stderr, "Execution resumes after PAUSE.\n"); fflush(stderr); return 0; /* NOT REACHED */ -#ifdef __cplusplus - } -#endif } diff --git a/libf2c/libF77/s_stop.c b/libf2c/libF77/s_stop.c index 6e8652aeb2e..391148f6c72 100644 --- a/libf2c/libF77/s_stop.c +++ b/libf2c/libF77/s_stop.c @@ -5,9 +5,6 @@ #undef min #undef max #include -#ifdef __cplusplus -extern "C" { -#endif void f_exit(void); int s_stop(char *s, ftnlen n) @@ -32,6 +29,3 @@ exit(0); return 0; /* NOT REACHED */ } -#ifdef __cplusplus -} -#endif diff --git a/libf2c/libF77/setarg.c b/libf2c/libF77/setarg.c index 83aedaf5fb7..5d8eea6ae65 100644 --- a/libf2c/libF77/setarg.c +++ b/libf2c/libF77/setarg.c @@ -11,10 +11,6 @@ int f__xargc; char **f__xargv; -#ifdef __cplusplus - } -#endif - void f_setarg(int argc, char **argv) { diff --git a/libf2c/libF77/setsig.c b/libf2c/libF77/setsig.c index 38fce0ac0c1..2ff6c06acd3 100644 --- a/libf2c/libF77/setsig.c +++ b/libf2c/libF77/setsig.c @@ -16,10 +16,6 @@ #define VOID void #endif -#ifdef __cplusplus -extern "C" { -#endif - extern void sig_die(char*, int); #define Int int @@ -66,10 +62,6 @@ sig_die("Trace trap", 1); #endif -#ifdef __cplusplus - } -#endif - void f_setsig() { diff --git a/libf2c/libF77/sig_die.c b/libf2c/libF77/sig_die.c index 507c7ee658e..7ed419aa354 100644 --- a/libf2c/libF77/sig_die.c +++ b/libf2c/libF77/sig_die.c @@ -8,9 +8,6 @@ #endif #include -#ifdef __cplusplus -extern "C" { -#endif extern void f_exit(void); void sig_die(register char *s, int kill) @@ -36,6 +33,3 @@ void sig_die(register char *s, int kill) exit(1); } } -#ifdef __cplusplus -} -#endif diff --git a/libf2c/libF77/signal1.h0 b/libf2c/libF77/signal1.h0 index d6d7b55d59c..9a0af2762da 100644 --- a/libf2c/libF77/signal1.h0 +++ b/libf2c/libF77/signal1.h0 @@ -22,10 +22,5 @@ typedef Sigret_t (*sig_pf)(Sigarg_t); #define signal1(a,b) signal(a,(sig_pf)b) -#ifdef __cplusplus -#define Sigarg ... -#define Use_Sigarg -#else #define Sigarg Int n #define Use_Sigarg n = n /* shut up compiler warning */ -#endif diff --git a/libf2c/libI77/close.c b/libf2c/libI77/close.c index e016fdaeb2e..1530348b3fa 100644 --- a/libf2c/libI77/close.c +++ b/libf2c/libI77/close.c @@ -14,13 +14,9 @@ #if defined (MSDOS) && !defined (GO32) #include "io.h" #else -#ifdef __cplusplus -extern "C" int unlink(const char*); -#else extern int unlink(const char*); #endif #endif -#endif integer f_clos(cllist *a) { unit *b; diff --git a/libf2c/libI77/dolio.c b/libf2c/libI77/dolio.c index 860af540922..b0220b165b4 100644 --- a/libf2c/libI77/dolio.c +++ b/libf2c/libI77/dolio.c @@ -1,15 +1,9 @@ #include "config.h" #include "f2c.h" -#ifdef __cplusplus -extern "C" { -#endif extern int (*f__lioproc)(ftnint*, char*, ftnlen, ftnint); integer do_lio(ftnint *type, ftnint *number, char *ptr, ftnlen len) { return((*f__lioproc)(number,ptr,len,*type)); } -#ifdef __cplusplus - } -#endif diff --git a/libf2c/libI77/fio.h b/libf2c/libI77/fio.h index 52086ba482e..81b1d0d10ae 100644 --- a/libf2c/libI77/fio.h +++ b/libf2c/libI77/fio.h @@ -60,9 +60,6 @@ extern cilist *f__elist; /*active external io list*/ extern flag f__reading,f__external,f__sequential,f__formatted; #undef Void #define Void void -#ifdef __cplusplus -extern "C" { -#endif extern int (*f__getn)(void); /* for formatted input */ extern void (*f__putn)(int); /* for formatted output */ extern void x_putc(int); @@ -81,9 +78,6 @@ extern int isatty(int); extern int err__fl(int,int,char*); extern int xrd_SL(void); extern int f__putbuf(int); -#ifdef __cplusplus - } -#endif extern int (*f__doend)(Void); extern FILE *f__cf; /*current file*/ extern unit *f__curunit; /*current unit*/ diff --git a/libf2c/libI77/fmt.h b/libf2c/libI77/fmt.h index 7219dce02d7..59b0eac51c6 100644 --- a/libf2c/libI77/fmt.h +++ b/libf2c/libI77/fmt.h @@ -53,9 +53,6 @@ typedef union longint ili; #endif } Uint; -#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); @@ -65,9 +62,6 @@ 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 - } -#endif extern flag f__cblank,f__cplus,f__workdone, f__nonl; extern char *f__fmtbuf; extern int f__fmtlen; diff --git a/libf2c/libI77/lio.h b/libf2c/libI77/lio.h index c9540db044c..7663fdeb819 100644 --- a/libf2c/libI77/lio.h +++ b/libf2c/libI77/lio.h @@ -54,9 +54,6 @@ typedef union doublereal fldouble; } flex; extern int f__scale; -#ifdef __cplusplus -extern "C" { -#endif extern int (*f__lioproc)(ftnint*, char*, ftnlen, ftnint); extern int l_write(ftnint*, char*, ftnlen, ftnint); extern void x_wsne(cilist*); @@ -64,7 +61,4 @@ extern int c_le(cilist*), (*l_getc)(void), (*l_ungetc)(int,FILE*); extern int l_read(ftnint*,char*,ftnlen,ftnint); extern integer e_rsle(void), e_wsle(void), s_wsne(cilist*); extern int z_rnew(void); -#ifdef __cplusplus - } -#endif extern ftnint L_len;