From eb0ef6f3a67120744b5c5c820ca13ebf50e4d064 Mon Sep 17 00:00:00 2001 From: Luca Toniolo <10792599+grandixximo@users.noreply.github.com> Date: Fri, 21 Aug 2026 10:28:02 +1000 Subject: [PATCH] classicladder: give the headers include guards and their own dependencies 30 of the 34 headers in hal/classicladder have no include guard, and 12 do not compile on their own. They name StrRung, StrSection, StrSymbol, StrStep, cairo_t or the gtk types without including whatever declares them, and build only because the file that included them had already got there. Guards go in first, since including classicladder.h from twelve places without them redefines everything. Then the twelve name what they use: classicladder.h for the ladder types, sequential.h for StrStep and StrTransition in drawing_sequential.h, for the five _gtk headers, and for drawing.h, and for the FILE * in files.h. The guards are named CLASSICLADDER__H. The four headers here that had one already used a leading underscore, which is reserved to the implementation, so they are renamed to match rather than left as a second convention in the same directory. Plain uppercase with no underscore is what most of the tree uses; the prefix is because names like FILES_H, CALC_H and GLOBAL_H are too general to leave unqualified. All 34 compile standalone afterwards, one translation unit per header against the userspace include path, where 22 did before. Full build clean, no errors and no warnings. The stdio.h line in files.h is also in #4425, which reaches it from the other direction; the two overlap by that one line and nothing else. --- src/hal/classicladder/arithm_eval.h | 5 +++++ src/hal/classicladder/calc.h | 7 +++++++ src/hal/classicladder/calc_sequential.h | 5 +++++ src/hal/classicladder/classicladder.h | 5 +++++ src/hal/classicladder/classicladder_gtk.h | 4 ++-- src/hal/classicladder/config_gtk.h | 5 +++++ src/hal/classicladder/drawing.h | 9 +++++++++ src/hal/classicladder/drawing_sequential.h | 8 ++++++++ src/hal/classicladder/edit.h | 7 +++++++ src/hal/classicladder/edit_copy.h | 5 +++++ src/hal/classicladder/edit_gtk.h | 6 ++++-- src/hal/classicladder/edit_sequential.h | 5 +++++ src/hal/classicladder/editproperties_gtk.h | 5 +++++ src/hal/classicladder/emc_mods.h | 5 +++++ src/hal/classicladder/files.h | 7 +++++++ src/hal/classicladder/files_project.h | 5 +++++ src/hal/classicladder/files_sequential.h | 5 +++++ src/hal/classicladder/global.h | 7 +++++++ src/hal/classicladder/manager.h | 5 +++++ src/hal/classicladder/manager_gtk.h | 7 +++++++ src/hal/classicladder/menu_and_toolbar_gtk.h | 7 +++++++ src/hal/classicladder/print_gtk.h | 5 +++++ src/hal/classicladder/protocol_modbus_defines.h | 4 ++-- src/hal/classicladder/protocol_modbus_master.h | 4 ++-- src/hal/classicladder/protocol_modbus_slave.h | 5 +++++ src/hal/classicladder/sequential.h | 5 +++++ src/hal/classicladder/serial_common.h | 5 +++++ src/hal/classicladder/socket_modbus_master.h | 5 +++++ src/hal/classicladder/socket_server.h | 5 +++++ src/hal/classicladder/spy_vars_gtk.h | 7 +++++++ src/hal/classicladder/symbols.h | 7 +++++++ src/hal/classicladder/symbols_gtk.h | 7 +++++++ src/hal/classicladder/vars_access.h | 5 +++++ src/hal/classicladder/vars_names.h | 5 +++++ 34 files changed, 185 insertions(+), 8 deletions(-) diff --git a/src/hal/classicladder/arithm_eval.h b/src/hal/classicladder/arithm_eval.h index 7706d748dd8..7c9d24d5e3c 100644 --- a/src/hal/classicladder/arithm_eval.h +++ b/src/hal/classicladder/arithm_eval.h @@ -14,6 +14,9 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +#ifndef CLASSICLADDER_ARITHM_EVAL_H +#define CLASSICLADDER_ARITHM_EVAL_H + #define arithmtype int @@ -26,3 +29,5 @@ char * VerifySyntaxForEvalCompare(char * StringToVerify); char * VerifySyntaxForMakeCalc(char * StringToVerify); + +#endif diff --git a/src/hal/classicladder/calc.h b/src/hal/classicladder/calc.h index 25b06a2d666..fc76e3f827a 100644 --- a/src/hal/classicladder/calc.h +++ b/src/hal/classicladder/calc.h @@ -14,6 +14,11 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +#ifndef CLASSICLADDER_CALC_H +#define CLASSICLADDER_CALC_H + +#include "classicladder.h" + void InitRungs(void); void PrepareRungs(void); void InitTimers(void); @@ -32,3 +37,5 @@ void WriteVarForElement( StrElement *pElem, int Value ); void RefreshASection( StrSection * pSection ); void ClassicLadder_RefreshAllSections(void); void CopyRungToRung(StrRung * RungSrc,StrRung * RungDest); + +#endif diff --git a/src/hal/classicladder/calc_sequential.h b/src/hal/classicladder/calc_sequential.h index 98d88c48f8c..2ac73fe43d3 100644 --- a/src/hal/classicladder/calc_sequential.h +++ b/src/hal/classicladder/calc_sequential.h @@ -13,6 +13,11 @@ // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +#ifndef CLASSICLADDER_CALC_SEQUENTIAL_H +#define CLASSICLADDER_CALC_SEQUENTIAL_H + void InitSequential( void ); void PrepareSequential( void ); void RefreshSequentialPage( int PageNbr ); + +#endif diff --git a/src/hal/classicladder/classicladder.h b/src/hal/classicladder/classicladder.h index 9cd0b7eaa62..43184253146 100644 --- a/src/hal/classicladder/classicladder.h +++ b/src/hal/classicladder/classicladder.h @@ -19,6 +19,9 @@ /* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ /* if GTK not included before */ +#ifndef CLASSICLADDER_H +#define CLASSICLADDER_H + #ifndef TRUE #define TRUE 1 #endif @@ -521,3 +524,5 @@ extern int modslave; //#define DBG_HEADER_ERR "ClassicLadder Error --- " #define DBG_HEADER_INFO "" #define DBG_HEADER_ERR "" + +#endif diff --git a/src/hal/classicladder/classicladder_gtk.h b/src/hal/classicladder/classicladder_gtk.h index 691bf789cc5..97e2c20d504 100644 --- a/src/hal/classicladder/classicladder_gtk.h +++ b/src/hal/classicladder/classicladder_gtk.h @@ -14,8 +14,8 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -#ifndef _CLASSICLADDER_GTK_H -#define _CLASSICLADDER_GTK_H +#ifndef CLASSICLADDER_CLASSICLADDER_GTK_H +#define CLASSICLADDER_CLASSICLADDER_GTK_H //For i18n #define _(STRING) gettext(STRING) diff --git a/src/hal/classicladder/config_gtk.h b/src/hal/classicladder/config_gtk.h index 98114a9890e..513d27d8a7e 100644 --- a/src/hal/classicladder/config_gtk.h +++ b/src/hal/classicladder/config_gtk.h @@ -13,4 +13,9 @@ // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +#ifndef CLASSICLADDER_CONFIG_GTK_H +#define CLASSICLADDER_CONFIG_GTK_H + void OpenConfigWindowGtk( ); + +#endif diff --git a/src/hal/classicladder/drawing.h b/src/hal/classicladder/drawing.h index 73bb7c49410..2b43689350c 100644 --- a/src/hal/classicladder/drawing.h +++ b/src/hal/classicladder/drawing.h @@ -13,6 +13,13 @@ // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +#ifndef CLASSICLADDER_DRAWING_H +#define CLASSICLADDER_DRAWING_H + +#include +#include +#include "classicladder.h" + #define DRAW_NORMAL 0 #define DRAW_FOR_TOOLBAR 1 #define DRAW_FOR_PRINT 2 @@ -31,3 +38,5 @@ void DrawRung( cairo_t * cr, StrRung * Rung, int OffX, int PosiY, int BlockWidth void DrawRungs( cairo_t * cr ); void DrawCurrentSection( cairo_t * cr ); + +#endif diff --git a/src/hal/classicladder/drawing_sequential.h b/src/hal/classicladder/drawing_sequential.h index 5ab4dd1fc9c..66e1f681fe1 100644 --- a/src/hal/classicladder/drawing_sequential.h +++ b/src/hal/classicladder/drawing_sequential.h @@ -13,9 +13,17 @@ // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +#ifndef CLASSICLADDER_DRAWING_SEQUENTIAL_H +#define CLASSICLADDER_DRAWING_SEQUENTIAL_H + +#include +#include "sequential.h" + void DrawSeqStep( cairo_t * cr,int x,int y,int Size,StrStep * pStep,char DrawingOption ); void DrawSeqTransition( cairo_t * cr,int x,int y,int Size,StrTransition * pTransi,char DrawingOption ); void DrawSequentialPage( cairo_t * cr, int PageNbr, int SeqPxSize, char DrawingOption ); void DrawSeqElementForToolBar( cairo_t * cr, int x, int y, int Size, int NumElement ); + +#endif diff --git a/src/hal/classicladder/edit.h b/src/hal/classicladder/edit.h index 3d5a7eae431..4a433fe3454 100644 --- a/src/hal/classicladder/edit.h +++ b/src/hal/classicladder/edit.h @@ -13,6 +13,11 @@ // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +#ifndef CLASSICLADDER_EDIT_H +#define CLASSICLADDER_EDIT_H + +#include "classicladder.h" + #define MODE_MODIFY 0 #define MODE_ADD 1 #define MODE_INSERT 2 @@ -43,3 +48,5 @@ char * ConvVarNameToHalSigName (char *); char * FirstVariableInArithm(char *); int SetDefaultVariableType(int NumElement); + +#endif diff --git a/src/hal/classicladder/edit_copy.h b/src/hal/classicladder/edit_copy.h index 66fb9a026cf..4f401e0a4ba 100644 --- a/src/hal/classicladder/edit_copy.h +++ b/src/hal/classicladder/edit_copy.h @@ -1,3 +1,6 @@ +#ifndef CLASSICLADDER_EDIT_COPY_H +#define CLASSICLADDER_EDIT_COPY_H + void StartOrMotionPartSelection(double x,double y, char StartToClick); void EndPartSelection( ); void GetSizesOfTheSelectionToCopy( int * pSizeX, int * pSizeY ); @@ -5,3 +8,5 @@ char GetIsOutputEleLastColumnSelection( ); void CopyNowPartSelected( double x,double y ); + +#endif diff --git a/src/hal/classicladder/edit_gtk.h b/src/hal/classicladder/edit_gtk.h index ab07082e49c..a6a7b265e3e 100644 --- a/src/hal/classicladder/edit_gtk.h +++ b/src/hal/classicladder/edit_gtk.h @@ -13,8 +13,10 @@ // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -#ifndef _EDIT_GTK_H -#define _EDIT_GTK_H +#ifndef CLASSICLADDER_EDIT_GTK_H +#define CLASSICLADDER_EDIT_GTK_H +#include + void EditorButtonsAccordingSectionType( ); void ButtonCancelCurrentRung(); void OpenEditWindow( GtkAction * ActionOpen, gboolean OpenIt ); diff --git a/src/hal/classicladder/edit_sequential.h b/src/hal/classicladder/edit_sequential.h index 97f388e4ffd..8d9cc6da323 100644 --- a/src/hal/classicladder/edit_sequential.h +++ b/src/hal/classicladder/edit_sequential.h @@ -13,9 +13,14 @@ // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +#ifndef CLASSICLADDER_EDIT_SEQUENTIAL_H +#define CLASSICLADDER_EDIT_SEQUENTIAL_H + void SaveSeqElementProperties( void ); void ModifyCurrentSeqPage(void); void CancelSeqPageEdited(void); void ApplySeqPageEdited(void); void EditElementInSeqPage(double x,double y); + +#endif diff --git a/src/hal/classicladder/editproperties_gtk.h b/src/hal/classicladder/editproperties_gtk.h index 933d6a199e7..7c9bae7bbe5 100644 --- a/src/hal/classicladder/editproperties_gtk.h +++ b/src/hal/classicladder/editproperties_gtk.h @@ -13,7 +13,12 @@ // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +#ifndef CLASSICLADDER_EDITPROPERTIES_GTK_H +#define CLASSICLADDER_EDITPROPERTIES_GTK_H + void SetProperty(int NumParam,char * LblParam,char * ValParam,char SetFocus); char * GetProperty(int NumParam); void ShowPropertiesWindow( int Visible ); void PropertiesInitGtk(); + +#endif diff --git a/src/hal/classicladder/emc_mods.h b/src/hal/classicladder/emc_mods.h index fb45ecc1089..86313db4ad5 100644 --- a/src/hal/classicladder/emc_mods.h +++ b/src/hal/classicladder/emc_mods.h @@ -13,6 +13,11 @@ // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +#ifndef CLASSICLADDER_EMC_MODS_H +#define CLASSICLADDER_EMC_MODS_H + char * ConvVarNameToHalSigName( char * VarNameParam ); char * FirstVariableInArithm(char * Expr); void SymbolsAutoAssign (void); + +#endif diff --git a/src/hal/classicladder/files.h b/src/hal/classicladder/files.h index 5c88f5e4fb8..824c3f3751f 100644 --- a/src/hal/classicladder/files.h +++ b/src/hal/classicladder/files.h @@ -13,6 +13,11 @@ // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +#ifndef CLASSICLADDER_FILES_H +#define CLASSICLADDER_FILES_H + +#include "classicladder.h" + #include // FILE #ifndef S_LINE @@ -66,3 +71,5 @@ void LoadAllLadderDatas(char * DatasDirectory); void SaveAllLadderDatas(char * DatasDirectory); void CleanTmpLadderDirectory( char DestroyDir ); + +#endif diff --git a/src/hal/classicladder/files_project.h b/src/hal/classicladder/files_project.h index 26b60c37677..c7e2607bf83 100644 --- a/src/hal/classicladder/files_project.h +++ b/src/hal/classicladder/files_project.h @@ -14,6 +14,9 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +#ifndef CLASSICLADDER_FILES_PROJECT_H +#define CLASSICLADDER_FILES_PROJECT_H + void VerifyDirectorySelected( char * NewDir ); void InitTempDir( void ); char LoadProjectFiles( char * FileProject ); @@ -21,3 +24,5 @@ char LoadGeneralParamsOnlyFromProject( char * FileProject ); char SaveProjectFiles( char * FileProject ); char JoinFiles( char * DirAndNameOfProject, char * TmpDirectoryFiles ); char SplitFiles( char * DirAndNameOfProject, char * TmpDirectoryFiles ); + +#endif diff --git a/src/hal/classicladder/files_sequential.h b/src/hal/classicladder/files_sequential.h index 0d8bb71142f..0f005f00ede 100644 --- a/src/hal/classicladder/files_sequential.h +++ b/src/hal/classicladder/files_sequential.h @@ -14,5 +14,10 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +#ifndef CLASSICLADDER_FILES_SEQUENTIAL_H +#define CLASSICLADDER_FILES_SEQUENTIAL_H + char LoadSequential(char * FileName); char SaveSequential(char * FileName); + +#endif diff --git a/src/hal/classicladder/global.h b/src/hal/classicladder/global.h index 917ba109edf..70bb6cecb64 100644 --- a/src/hal/classicladder/global.h +++ b/src/hal/classicladder/global.h @@ -18,6 +18,11 @@ /* License along with this library; if not, write to the Free Software */ /* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#ifndef CLASSICLADDER_GLOBAL_H +#define CLASSICLADDER_GLOBAL_H + +#include "classicladder.h" + #ifdef MAT_CONNECTION #include "../../lib/plc.h" #define TYPE_FOR_BOOL_VAR plc_pt_t @@ -82,3 +87,5 @@ extern char * ErrorMessageVarParser; //extern int ListCurrentDefParam[ NBR_CURRENT_DEFS_MAX ]; + +#endif diff --git a/src/hal/classicladder/manager.h b/src/hal/classicladder/manager.h index 3ea1d733fa6..943448c64c3 100644 --- a/src/hal/classicladder/manager.h +++ b/src/hal/classicladder/manager.h @@ -13,6 +13,9 @@ // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +#ifndef CLASSICLADDER_MANAGER_H +#define CLASSICLADDER_MANAGER_H + void InitSections( void ); int SearchSubRoutineWithItsNumber( int SubRoutineNbrToFind ); int SearchSectionWithName( char * SectionNameToFind ); @@ -27,3 +30,5 @@ int GetPrevNextSection( int RefSectionNbr, char NextSearch ); void SwapSections( int SectionNbr1, int SectionNbr2 /*char * SectionName1, char * SectionName2*/ ); int FindFreeSequentialPage( void ); + +#endif diff --git a/src/hal/classicladder/manager_gtk.h b/src/hal/classicladder/manager_gtk.h index 2065a2fb56b..a788b79c114 100644 --- a/src/hal/classicladder/manager_gtk.h +++ b/src/hal/classicladder/manager_gtk.h @@ -13,7 +13,14 @@ // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +#ifndef CLASSICLADDER_MANAGER_GTK_H +#define CLASSICLADDER_MANAGER_GTK_H + +#include + void ManagerDisplaySections( char ForgetSectionSelected ); void OpenManagerWindow( GtkAction * ActionOpen, gboolean OpenIt ); void ManagerEnableActionsSectionsList( char cState ); void ManagerInitGtk(); + +#endif diff --git a/src/hal/classicladder/menu_and_toolbar_gtk.h b/src/hal/classicladder/menu_and_toolbar_gtk.h index b01374f5075..7dd33984548 100644 --- a/src/hal/classicladder/menu_and_toolbar_gtk.h +++ b/src/hal/classicladder/menu_and_toolbar_gtk.h @@ -1,5 +1,10 @@ +#ifndef CLASSICLADDER_MENU_AND_TOOLBAR_GTK_H +#define CLASSICLADDER_MENU_AND_TOOLBAR_GTK_H + +#include + GtkUIManager * InitMenusAndToolBar( GtkWidget *vbox ); void SetToogleMenuForSectionsManagerWindow( gboolean OpenedWin ); void SetToggleMenuForEditorWindow( gboolean OpenedWin ); @@ -9,3 +14,5 @@ void SetToggleMenuForFreeVarsWindow( gboolean OpenedWin ); void SetToggleMenuForLogWindow( gboolean OpenedWin ); void SetMenuStateForRunStopSwitch( gboolean Running ); + +#endif diff --git a/src/hal/classicladder/print_gtk.h b/src/hal/classicladder/print_gtk.h index 4f5843e00bd..9c501302f65 100644 --- a/src/hal/classicladder/print_gtk.h +++ b/src/hal/classicladder/print_gtk.h @@ -1,3 +1,8 @@ +#ifndef CLASSICLADDER_PRINT_GTK_H +#define CLASSICLADDER_PRINT_GTK_H + void PrintGtk( ); void PrintPreviewGtk( ); + +#endif diff --git a/src/hal/classicladder/protocol_modbus_defines.h b/src/hal/classicladder/protocol_modbus_defines.h index 0694525392f..645c6f4044f 100644 --- a/src/hal/classicladder/protocol_modbus_defines.h +++ b/src/hal/classicladder/protocol_modbus_defines.h @@ -14,8 +14,8 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -#ifndef _PROTOCOL_MODBUS_DEFINES_H -#define _PROTOCOL_MODBUS_DEFINES_H +#ifndef CLASSICLADDER_PROTOCOL_MODBUS_DEFINES_H +#define CLASSICLADDER_PROTOCOL_MODBUS_DEFINES_H /* To set/reset single coil with function 5 */ #define MODBUS_BIT_OFF 0x0000 diff --git a/src/hal/classicladder/protocol_modbus_master.h b/src/hal/classicladder/protocol_modbus_master.h index 1480e8e290f..628e6074fdf 100644 --- a/src/hal/classicladder/protocol_modbus_master.h +++ b/src/hal/classicladder/protocol_modbus_master.h @@ -14,8 +14,8 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -#ifndef _PROTOCOL_MODBUS_MASTER_H -#define _PROTOCOL_MODBUS_MASTER_H +#ifndef CLASSICLADDER_PROTOCOL_MODBUS_MASTER_H +#define CLASSICLADDER_PROTOCOL_MODBUS_MASTER_H /* Modbus requests list available for the user */ #define MODBUS_REQ_INPUTS_READ 0 diff --git a/src/hal/classicladder/protocol_modbus_slave.h b/src/hal/classicladder/protocol_modbus_slave.h index a078b53d1f1..ec707ef19e1 100644 --- a/src/hal/classicladder/protocol_modbus_slave.h +++ b/src/hal/classicladder/protocol_modbus_slave.h @@ -14,8 +14,13 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +#ifndef CLASSICLADDER_PROTOCOL_MODBUS_SLAVE_H +#define CLASSICLADDER_PROTOCOL_MODBUS_SLAVE_H + int ModbusRequestToRespond( unsigned char * Question, int LgtQuestion, unsigned char * Response ); int GetMobdusSlaveNbrVars( unsigned char FunctCode ); void SetVarFromModbusSlave( unsigned char FunctCode, int ModbusNum, int Value ); int GetVarForModbusSlave( unsigned char FunctCode, int ModbusNum ); + +#endif diff --git a/src/hal/classicladder/sequential.h b/src/hal/classicladder/sequential.h index 1e5913a559e..bbe497b7fc8 100644 --- a/src/hal/classicladder/sequential.h +++ b/src/hal/classicladder/sequential.h @@ -19,6 +19,9 @@ /* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#ifndef CLASSICLADDER_SEQUENTIAL_H +#define CLASSICLADDER_SEQUENTIAL_H + #define NBR_SEQUENTIAL_PAGES 5 #define NBR_STEPS 128 @@ -117,3 +120,5 @@ typedef struct StrSequential }StrSequential; + +#endif diff --git a/src/hal/classicladder/serial_common.h b/src/hal/classicladder/serial_common.h index 24d937fe29d..9ea2db76baf 100644 --- a/src/hal/classicladder/serial_common.h +++ b/src/hal/classicladder/serial_common.h @@ -14,6 +14,9 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +#ifndef CLASSICLADDER_SERIAL_COMMON_H +#define CLASSICLADDER_SERIAL_COMMON_H + char SerialOpen( ); void SerialClose( ); char SerialPortIsOpened( void ); @@ -22,3 +25,5 @@ void SerialSetResponseSize( int Size, int TimeOutResp ); int SerialReceive( char * Buff, int MaxBuffLength ); void SerialPurge( void ); + +#endif diff --git a/src/hal/classicladder/socket_modbus_master.h b/src/hal/classicladder/socket_modbus_master.h index c2504441a46..e442657637a 100644 --- a/src/hal/classicladder/socket_modbus_master.h +++ b/src/hal/classicladder/socket_modbus_master.h @@ -13,9 +13,14 @@ // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +#ifndef CLASSICLADDER_SOCKET_MODBUS_MASTER_H +#define CLASSICLADDER_SOCKET_MODBUS_MASTER_H + void InitSocketModbusMaster( void ); void ConfigSerialModbusMaster( void ); void CloseSocketModbusMaster( void ); void SocketModbusMasterLoop( void ); //void GetSocketModbusMasterStats( char * Buff ); + +#endif diff --git a/src/hal/classicladder/socket_server.h b/src/hal/classicladder/socket_server.h index 11235bc0c05..698517df5d1 100644 --- a/src/hal/classicladder/socket_server.h +++ b/src/hal/classicladder/socket_server.h @@ -15,7 +15,12 @@ // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +#ifndef CLASSICLADDER_SOCKET_SERVER_H +#define CLASSICLADDER_SOCKET_SERVER_H + void InitSocketServer( int UseUdpMode, int PortNbr ); void SocketServerTcpMainLoop( void ); void CloseSocketServer( void ); + +#endif diff --git a/src/hal/classicladder/spy_vars_gtk.h b/src/hal/classicladder/spy_vars_gtk.h index 9aea97eedbd..351126d55db 100644 --- a/src/hal/classicladder/spy_vars_gtk.h +++ b/src/hal/classicladder/spy_vars_gtk.h @@ -14,8 +14,15 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +#ifndef CLASSICLADDER_SPY_VARS_GTK_H +#define CLASSICLADDER_SPY_VARS_GTK_H + +#include + void RefreshAllBoolsVars( ); void OpenSpyBoolVarsWindow( GtkAction * ActionOpen, gboolean OpenIt ); void DisplayFreeVarSpy( ); void OpenSpyFreeVarsWindow( GtkAction * ActionOpen, gboolean OpenIt ); void VarsWindowInitGtk( ); + +#endif diff --git a/src/hal/classicladder/symbols.h b/src/hal/classicladder/symbols.h index 47ef70e3d72..595009c2397 100644 --- a/src/hal/classicladder/symbols.h +++ b/src/hal/classicladder/symbols.h @@ -14,7 +14,14 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +#ifndef CLASSICLADDER_SYMBOLS_H +#define CLASSICLADDER_SYMBOLS_H + +#include "classicladder.h" + void InitSymbols( void ); StrSymbol * ConvVarNameInSymbolPtr( char * tcVarNameVar ); char * ConvVarNameToSymbol( char * VarNameParam ); char * ConvSymbolToVarName( char * SymbolParam ); + +#endif diff --git a/src/hal/classicladder/symbols_gtk.h b/src/hal/classicladder/symbols_gtk.h index d6f52d8129b..dd1cc39581c 100644 --- a/src/hal/classicladder/symbols_gtk.h +++ b/src/hal/classicladder/symbols_gtk.h @@ -14,7 +14,14 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +#ifndef CLASSICLADDER_SYMBOLS_GTK_H +#define CLASSICLADDER_SYMBOLS_GTK_H + +#include + void DisplaySymbols( ); void OpenSymbolsWindow( GtkAction * ActionOpen, gboolean OpenIt ); void SymbolsInitGtk(); + +#endif diff --git a/src/hal/classicladder/vars_access.h b/src/hal/classicladder/vars_access.h index 5f1eafc5952..854682b27a1 100644 --- a/src/hal/classicladder/vars_access.h +++ b/src/hal/classicladder/vars_access.h @@ -13,6 +13,9 @@ // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +#ifndef CLASSICLADDER_VARS_ACCESS_H +#define CLASSICLADDER_VARS_ACCESS_H + void InitVars(void); int ReadVar(int TypeVar,int Offset); void WriteVar(int TypeVar,int NumVar,int Value); @@ -21,3 +24,5 @@ void WriteVar(int TypeVar,int NumVar,int Value); void DoneVars(void); void CycleStart(void); void CycleEnd(void); + +#endif diff --git a/src/hal/classicladder/vars_names.h b/src/hal/classicladder/vars_names.h index 7a9077f467a..79a8b5d5873 100644 --- a/src/hal/classicladder/vars_names.h +++ b/src/hal/classicladder/vars_names.h @@ -15,8 +15,13 @@ // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +#ifndef CLASSICLADDER_VARS_NAMES_H +#define CLASSICLADDER_VARS_NAMES_H + int GetSizeVarsForTypeVar( int iTypeVarToSearch ); char * CreateVarName(int Type, int Offset, char SymbolNameIfAvail); char TextParserForAVar( char * TextToParse, int * VarTypeFound, int * VarOffsetFound, int * pNumberOfChars, char PartialNames ); char TestVarIsReadWrite( int TypeVarTested, int OffsetVarTested ); + +#endif