lefty: remove C++ guards

This program is entirely C, so does not need these explicit linkage specs.

diff --git a/cmd/lefty/aix_mods/common.h b/cmd/lefty/aix_mods/common.h
index 8fe211196ba87e82390d6c740148e1b105fd867a..250e82f6ab6f6d9fc3d3d10e934fc530a4c392e8 100644 (file)
--- a/cmd/lefty/aix_mods/common.h
+++ b/cmd/lefty/aix_mods/common.h
@@ -8,10 +8,6 @@
  * Contributors: Details at https://graphviz.org
  *************************************************************************/
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* Lefteris Koutsofios - AT&T Bell Laboratories */
 
 #ifndef _COMMON_H
@@ -76,7 +72,3 @@ extern "C" {
 #undef NORETURN
 
 #endif                         /* _COMMON_H */
-
-#ifdef __cplusplus
-}
-#endif

diff --git a/cmd/lefty/code.h b/cmd/lefty/code.h
index c6d91c74cd93b45910a06214fa9ac548b1ea4cd1..f09861edb4dbd4120e1188a2897263be91e9b4fc 100644 (file)
--- a/cmd/lefty/code.h
+++ b/cmd/lefty/code.h
@@ -10,10 +10,6 @@
 
 #pragma once
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* Lefteris Koutsofios - AT&T Labs Research */
 
 #define C_NULL -1
@@ -94,8 +90,3 @@ int Cnew (int);
 int Cinteger (long);
 int Creal (double);
 int Cstring (char *);
-
-#ifdef __cplusplus
-}
-#endif
-

diff --git a/cmd/lefty/common.h b/cmd/lefty/common.h
index 3bcfdb4d38dc9bdbdfb88a338ed408c2f5d7c9c6..53c86fc092eb8c0b047ee423bd983848f0829d79 100644 (file)
--- a/cmd/lefty/common.h
+++ b/cmd/lefty/common.h
@@ -8,10 +8,6 @@
  * Contributors: Details at https://graphviz.org
  *************************************************************************/
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* Lefteris Koutsofios - AT&T Labs Research */
 
 #ifndef _COMMON_H
@@ -106,7 +102,3 @@ NORETURN void panic2 (char *, int, char *, char *, ...);
 #undef NORETURN
 
 #endif /* _COMMON_H */
-
-#ifdef __cplusplus
-}
-#endif

diff --git a/cmd/lefty/cs2l/cs2l.h b/cmd/lefty/cs2l/cs2l.h
index 5d8a6ad6efbe3d687fa58f795c5f5bdbd91c787f..804f6c90e7b4ee8270b11b71ec578fab64141fa7 100644 (file)
--- a/cmd/lefty/cs2l/cs2l.h
+++ b/cmd/lefty/cs2l/cs2l.h
@@ -10,12 +10,4 @@
 
 #pragma once
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
     int C2Lopen(char *, char *, FILE **, FILE **);
-
-#ifdef __cplusplus
-}
-#endif

diff --git a/cmd/lefty/display.h b/cmd/lefty/display.h
index 4c8e461d1452578a80ecf0cc2bd8971fe52f5b96..56527a3ddc48b8eea53069b5c71d1db371ac66b3 100644 (file)
--- a/cmd/lefty/display.h
+++ b/cmd/lefty/display.h
@@ -10,16 +10,8 @@
 
 #pragma once
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* Lefteris Koutsofios - AT&T Labs Research */
 
 void Dinit (void);
 void Dterm (void);
 void Dtrace (Tobj, int);
-
-#ifdef __cplusplus
-}   
-#endif

diff --git a/cmd/lefty/dot2l/dot2l.h b/cmd/lefty/dot2l/dot2l.h
index 4a90db555327b33f1e44a0b5a3e6a795ba16c8bb..37645bc2c87fbe409f537aef955c4a8531f783e8 100644 (file)
--- a/cmd/lefty/dot2l/dot2l.h
+++ b/cmd/lefty/dot2l/dot2l.h
@@ -10,10 +10,6 @@
 
 #pragma once
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #define SMALLBUF 128
 
 int yyparse(void);
@@ -62,8 +58,3 @@ void D2Lbeginedge (int, Tobj, char *);
 void D2Lmidedge (int, Tobj, char *);
 void D2Lendedge (void);
 void D2Lsetattr (char *, char *);
-
-#ifdef __cplusplus
-}
-#endif
-

diff --git a/cmd/lefty/dot2l/triefa.h b/cmd/lefty/dot2l/triefa.h
index 871c14e14892bddb34f29010ba0941d6ffa80707..5c5b775226d146d03f72be5aae1b3a7dd9ce7445 100644 (file)
--- a/cmd/lefty/dot2l/triefa.h
+++ b/cmd/lefty/dot2l/triefa.h
@@ -8,10 +8,6 @@
  * Contributors: Details at https://graphviz.org
  *************************************************************************/
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /*  File - TrieFA.h
     The data types for the generated trie-baseed finite automata.
 */
@@ -33,8 +29,3 @@ typedef struct TrieTrans TrieTrans;
 
 extern TrieState TrieStateTbl[];
 extern TrieTrans TrieTransTbl[];
-
-#ifdef __cplusplus
-}
-#endif
-

diff --git a/cmd/lefty/exec.h b/cmd/lefty/exec.h
index 4a8a2abfe417016cd821c011e31aaae57251e257..cea66141e03e0102b089142243a1dae97f64b01a 100644 (file)
--- a/cmd/lefty/exec.h
+++ b/cmd/lefty/exec.h
@@ -10,10 +10,6 @@
 
 #pragma once
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* Lefteris Koutsofios - AT&T Labs Research */
 
 typedef struct Tonm_t lvar_t;
@@ -27,8 +23,3 @@ void Einit (void);
 void Eterm (void);
 Tobj Eunit (Tobj);
 Tobj Efunction (Tobj, char *);
-
-#ifdef __cplusplus
-}
-#endif
-

diff --git a/cmd/lefty/g.h b/cmd/lefty/g.h
index 2aa1ca74a168dd54d4cb59c0c8ee9571ad155a0f..f61ac67cfe09685df609b7da3930f3d46f0b94e0 100644 (file)
--- a/cmd/lefty/g.h
+++ b/cmd/lefty/g.h
@@ -10,10 +10,6 @@
 
 #pragma once
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* Lefteris Koutsofios - AT&T Labs Research */
 
 #ifdef FEATURE_X11
@@ -546,8 +542,3 @@ void Gerr (char *, int, int, ...);
 #define G_ERRCANNOTCREATEBITMAP 20
 #define G_ERRNOBITMAP           21
 #define G_ERRCANNOTREADBITMAP   22
-
-#ifdef __cplusplus
-}
-#endif
-

diff --git a/cmd/lefty/gfxview.h b/cmd/lefty/gfxview.h
index 4ea84471015086682ea447dd14f6cf91409cdcfa..245bbd53b3e81b1668a20f5b940b3c83674fbff1 100644 (file)
--- a/cmd/lefty/gfxview.h
+++ b/cmd/lefty/gfxview.h
@@ -10,10 +10,6 @@
 
 #pragma once
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* Lefteris Koutsofios - AT&T Labs Research */
 
 void GFXinit (void);
@@ -51,8 +47,3 @@ int GFXclearpick (int, lvar_t *);
 int GFXsetpick (int, lvar_t *);
 int GFXdisplaymenu (int, lvar_t *);
 int GFXcolormap (int, lvar_t *);
-
-#ifdef __cplusplus
-}
-#endif
-

diff --git a/cmd/lefty/internal.h b/cmd/lefty/internal.h
index c20b63b197db303368543cff86e015167e6b5f6d..bab850e709374a9d511f61644b5eeefb7b977d90 100644 (file)
--- a/cmd/lefty/internal.h
+++ b/cmd/lefty/internal.h
@@ -10,10 +10,6 @@
 
 #pragma once
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* Lefteris Koutsofios - AT&T Labs Research */
 
 typedef struct Ifunc_t {
@@ -28,8 +24,3 @@ int Igetfunc (char *);
 
 extern Ifunc_t Ifuncs[];
 extern int Ifuncn;
-
-#ifdef __cplusplus
-}
-#endif
-

diff --git a/cmd/lefty/leftyio.h b/cmd/lefty/leftyio.h
index a4c3a25cebacfab6db49a60c2bb44d2c7f300a7e..7fd42d6654523676712becc4b2530e00f0f3544b 100644 (file)
--- a/cmd/lefty/leftyio.h
+++ b/cmd/lefty/leftyio.h
@@ -10,10 +10,6 @@
 
 #pragma once
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* Lefteris Koutsofios - AT&T Labs Research */
 
 #define IO_FILE   0
@@ -68,8 +64,3 @@ int IOclose (int, char *);
 int IOreadline (int, char *, int);
 int IOread (int, char *, int);
 int IOwriteline (int, char *);
-
-#ifdef __cplusplus
-}
-#endif
-

diff --git a/cmd/lefty/lex.h b/cmd/lefty/lex.h
index e8605d4489ec2cd98b91d28e1f46e8339f4b44dc..cbeeea6be1891046a208988821feb9894f695f04 100644 (file)
--- a/cmd/lefty/lex.h
+++ b/cmd/lefty/lex.h
@@ -10,10 +10,6 @@
 
 #pragma once
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* Lefteris Koutsofios - AT&T Labs Research */
 
 #define L_SEMI      0
@@ -69,8 +65,3 @@ void Lsetsrc (int, char *, FILE *, int, int);
 void Lgetsrc (int *, char **, FILE **, int *, int *);
 void Lprintpos (void);
 void Lgtok (void);
-
-#ifdef __cplusplus
-}
-#endif
-

diff --git a/cmd/lefty/mem.h b/cmd/lefty/mem.h
index 680e08843a769ad727a7f94a2b5f95e1a70fb034..d19c6538f70010ca3da8a55ee5e3ef4b93cc4444 100644 (file)
--- a/cmd/lefty/mem.h
+++ b/cmd/lefty/mem.h
@@ -10,10 +10,6 @@
 
 #pragma once
 
-#ifdef __cplusplus
-extern "C" {
-#endif  
-
 /* Lefteris Koutsofios - AT&T Labs Research */
 
 #ifdef FEATURE_MINTSIZE
@@ -59,8 +55,3 @@ void Mresetmark (long, void *);
 void Mmkcurr (void *);
 void Mdogc (int);
 void Mreport (void);
-
-#ifdef __cplusplus
-}
-#endif
-

diff --git a/cmd/lefty/parse.h b/cmd/lefty/parse.h
index 87990db7f9af68ba087b7661acd82f2d1c17fd22..14f923bf431283d0b0ad34484e82a476ff7d47ef 100644 (file)
--- a/cmd/lefty/parse.h
+++ b/cmd/lefty/parse.h
@@ -10,10 +10,6 @@
 
 #pragma once
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* Lefteris Koutsofios - AT&T Labs Research */
 
 typedef struct Psrc_t {
@@ -29,7 +25,3 @@ void Pterm (void);
 Tobj Punit (Psrc_t *);
 Tobj Pfcall (Tobj, Tobj);
 Tobj Pfunction (char *, int);
-
-#ifdef __cplusplus
-}
-#endif

diff --git a/cmd/lefty/str.h b/cmd/lefty/str.h
index d010269265f47e8bf9f22c2d705117b7020bd427..a9f4dc1374a7da5fce5abfb0dcda3929beaaeccb 100644 (file)
--- a/cmd/lefty/str.h
+++ b/cmd/lefty/str.h
@@ -10,10 +10,6 @@
 
 #pragma once
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* Lefteris Koutsofios - AT&T Labs Research */
 
 void Sinit (void);
@@ -24,7 +20,3 @@ char *Sabstract (Tobj, Tobj);
 char *Stfull (Tobj);
 char *Ssfull (Tobj, Tobj);
 char *Scfull (Tobj, int, int);
-
-#ifdef __cplusplus
-}
-#endif

diff --git a/cmd/lefty/tbl.h b/cmd/lefty/tbl.h
index d383a7dd5f362f0dd10e958a2b2f6ebaa599585e..777c2bcc409e3d3f60cab17a2acad1482c0f64f3 100644 (file)
--- a/cmd/lefty/tbl.h
+++ b/cmd/lefty/tbl.h
@@ -8,10 +8,6 @@
  * Contributors: Details at https://graphviz.org
  *************************************************************************/
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* Lefteris Koutsofios - AT&T Labs Research */
 
 #pragma once
@@ -132,7 +128,3 @@ void Tdelo (Tobj, Tobj);
 Tobj Tcopy (Tobj);
 void Tgetfirst (Tobj, Tkvindex_t *);
 void Tgetnext (Tkvindex_t *);
-
-#ifdef __cplusplus
-}
-#endif

diff --git a/cmd/lefty/txtview.h b/cmd/lefty/txtview.h
index 3da1d97f471e6be172be6e6ecdeb2790587e06a9..441a3a338e24733f87c5c2165d3a6d001c776dbd 100644 (file)
--- a/cmd/lefty/txtview.h
+++ b/cmd/lefty/txtview.h
@@ -10,10 +10,6 @@
 
 #pragma once
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* Lefteris Koutsofios - AT&T Labs Research */
 
 void TXTinit (Grect_t);
@@ -23,7 +19,3 @@ int TXTask (int argc, lvar_t *argv);
 void TXTprocess (int, char *);
 void TXTupdate (void);
 void TXTtoggle (int, void *);
-
-#ifdef __cplusplus
-}
-#endif

diff --git a/cmd/lefty/ws/mswin32/gcommon.h b/cmd/lefty/ws/mswin32/gcommon.h
index 8e34f74c0615c167f9155bc1d510065aea9c6790..b45d3149820104c6ac42615146a3f103f23c72e4 100644 (file)
--- a/cmd/lefty/ws/mswin32/gcommon.h
+++ b/cmd/lefty/ws/mswin32/gcommon.h
@@ -10,10 +10,6 @@
 
 #pragma once
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* Lefteris Koutsofios - AT&T Labs Research */
 
 extern HANDLE hinstance, hprevinstance;
@@ -169,8 +165,3 @@ void Gawdeletechild (Gwidget_t *, Gwidget_t *);
 void Gadjustwrect (Gwidget_t *, PIXsize_t *);
 void Gadjustclip (Gwidget_t *);
 Gpoint_t ppixtodraw (Gwidget_t *, PIXpoint_t);
-
-#ifdef __cplusplus
-}
-#endif
-

diff --git a/cmd/lefty/ws/mswin32/resource.h b/cmd/lefty/ws/mswin32/resource.h
index fc75e60c9f349b73dfcc809f170d88cceba0ff8b..a310975df134422064e356df8d6f19a2c498041d 100644 (file)
--- a/cmd/lefty/ws/mswin32/resource.h
+++ b/cmd/lefty/ws/mswin32/resource.h
@@ -8,10 +8,6 @@
  * Contributors: Details at https://graphviz.org
  *************************************************************************/
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 //{{NO_DEPENDENCIES}}
 // Microsoft Developer Studio generated include file.
 // Used by lefty.rc
@@ -32,7 +28,3 @@ extern "C" {
 #define _APS_NEXT_SYMED_VALUE           101
 #endif
 #endif
-
-#ifdef __cplusplus
-}
-#endif

diff --git a/cmd/lefty/ws/none/gcommon.h b/cmd/lefty/ws/none/gcommon.h
index 52bb4d41327d172e32720b5b244f1caa7c862f34..70cc6859dedeb415fdf55aca66b93c8895c559e3 100644 (file)
--- a/cmd/lefty/ws/none/gcommon.h
+++ b/cmd/lefty/ws/none/gcommon.h
@@ -10,10 +10,6 @@
 
 #pragma once
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* Lefteris Koutsofios - AT&T Labs Research */
 
 typedef struct {
@@ -124,8 +120,3 @@ int GVgetwidgetattr (Gwidget_t *, int, Gwattr_t *);
 int GVdestroywidget (Gwidget_t *);
 
 void Gawdefcoordscb (int, Gawdata_t *);
-
-#ifdef __cplusplus
-}
-#endif
-

diff --git a/cmd/lefty/ws/x11/gcommon.h b/cmd/lefty/ws/x11/gcommon.h
index 75cd6d62dab5cf710cbc8faaf82ba748264f5d42..3d3760e87e3c9cc8c0d8cb35249247c554fa7286 100644 (file)
--- a/cmd/lefty/ws/x11/gcommon.h
+++ b/cmd/lefty/ws/x11/gcommon.h
@@ -10,10 +10,6 @@
 
 #pragma once
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* Lefteris Koutsofios - AT&T Labs Research */
 
 #if XlibSpecificationRelease < 5
@@ -206,8 +202,3 @@ extern XtTranslations Gqwdeltable;
 extern XtTranslations Gwmdeltable;
 
 extern Atom Gqwdelatom, Gwmdelatom;
-
-#ifdef __cplusplus
-}
-#endif
-

diff --git a/cmd/lefty/ws/x11/libfilereq/SF.h b/cmd/lefty/ws/x11/libfilereq/SF.h
index 5c1d1457ee2b48f42ebde7ad7fd5e2ea7e7b6222..61926eb0c50dc62a65161193d737e47cff226181 100644 (file)
--- a/cmd/lefty/ws/x11/libfilereq/SF.h
+++ b/cmd/lefty/ws/x11/libfilereq/SF.h
@@ -8,16 +8,7 @@
  * Contributors: Details at https://graphviz.org
  *************************************************************************/
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 int XsraSelFile (
     Widget, char *, char *, char *, char *, char *, char *,
     int (*) (char *, char **, struct stat *), char *, int
 );
-
-#ifdef __cplusplus
-}
-#endif
-

diff --git a/cmd/lefty/ws/x11/libfilereq/SFDecls.h b/cmd/lefty/ws/x11/libfilereq/SFDecls.h
index 44c259508ccdaee2c47c357b33e40b9be6c44399..b158b5d14374d42298e2d4b5c1be5855296b1b24 100644 (file)
--- a/cmd/lefty/ws/x11/libfilereq/SFDecls.h
+++ b/cmd/lefty/ws/x11/libfilereq/SFDecls.h
@@ -8,10 +8,6 @@
  * Contributors: Details at https://graphviz.org
  *************************************************************************/
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* SFDecls.h */
 
 /* We don't rely on compiler doing the right thing
@@ -39,8 +35,3 @@ void SFsetText (char *path);
 /* Dir.c */
 int SFcompareEntries (const void *vp, const void *vq);
 int SFgetDir (SFDir *dir);
-
-#ifdef __cplusplus
-}
-#endif
-

diff --git a/cmd/lefty/ws/x11/libfilereq/SFinternal.h b/cmd/lefty/ws/x11/libfilereq/SFinternal.h
index ecce65a8753b487a90d8b316dae2fad2b5972201..94f01b4ea517553a0989a27091a83453aaa4428d 100644 (file)
--- a/cmd/lefty/ws/x11/libfilereq/SFinternal.h
+++ b/cmd/lefty/ws/x11/libfilereq/SFinternal.h
@@ -8,10 +8,6 @@
  * Contributors: Details at https://graphviz.org
  *************************************************************************/
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /*
  * Copyright 1989 Software Research Associates, Inc., Tokyo, Japan
  *
@@ -148,8 +144,3 @@ char SFstatChar (struct stat *);
 extern XtIntervalId SFdirModTimerId;
 
 extern int (*SFfunc) (char *, char **, struct stat *);
-
-#ifdef __cplusplus
-}
-#endif
-

diff --git a/cmd/lefty/ws/x11/libfilereq/xstat.h b/cmd/lefty/ws/x11/libfilereq/xstat.h
index 57172f95eb5e0736ba287bfafc9e2e9f9b4b272f..cadfdde2173d4630558f650f732e3f80fa634780 100644 (file)
--- a/cmd/lefty/ws/x11/libfilereq/xstat.h
+++ b/cmd/lefty/ws/x11/libfilereq/xstat.h
@@ -8,10 +8,6 @@
  * Contributors: Details at https://graphviz.org
  *************************************************************************/
 
-#ifdef __cplusplus 
-extern "C" {
-#endif
-
 #include <sys/stat.h>
 #if !defined(S_ISDIR) && defined(S_IFDIR)
 #define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
@@ -34,8 +30,3 @@ extern "C" {
 #endif
 
 #define S_ISXXX(m) ((m) & (S_IXUSR | S_IXGRP | S_IXOTH))
-
-#ifdef __cplusplus
-}
-#endif
-