mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-09 05:10:05 +02:00
liblayout: fix header guards to prefix with LAYOUT
This commit is contained in:
Jérôme Duval
@@ -16,11 +16,12 @@ around to support legacy apps that have not migrated to the Haiku layout kit."
|
||||
HOMEPAGE="https://web.archive.org/web/20071227072934/http://www.xs4all.nl:80/~marcone/be.html"
|
||||
COPYRIGHT="1996-2003 Marco Nelissen"
|
||||
LICENSE="LIBLAYOUT"
|
||||
REVISION="8"
|
||||
REVISION="9"
|
||||
srcGitRev="a67fd7bf6a6980349f7b14893bb0b2cf6c6f9fbc"
|
||||
SOURCE_URI="https://github.com/pulkomandy/liblayout/archive/$srcGitRev.tar.gz"
|
||||
CHECKSUM_SHA256="18d6d1461221b7e23e2f472b9c14fe787b6a6c2558825e250b324321cb131ec0"
|
||||
SOURCE_DIR="liblayout-$srcGitRev"
|
||||
PATCHES="liblayout-$portVersion.patchset"
|
||||
|
||||
ARCHITECTURES="all"
|
||||
SECONDARY_ARCHITECTURES="x86 x86_gcc2"
|
||||
|
||||
526
haiku-libs/liblayout/patches/liblayout-1.4.1.patchset
Normal file
526
haiku-libs/liblayout/patches/liblayout-1.4.1.patchset
Normal file
@@ -0,0 +1,526 @@
|
||||
From b3a1d2218cfbe49ef17b3a255a8af152dbe8f519 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= <jerome.duval@gmail.com>
|
||||
Date: Sat, 14 Sep 2024 14:50:01 +0200
|
||||
Subject: header guard with LAYOUT as prefix
|
||||
|
||||
|
||||
diff --git a/headers/HGroup.h b/headers/HGroup.h
|
||||
index b844cdd..12b5839 100644
|
||||
--- a/headers/HGroup.h
|
||||
+++ b/headers/HGroup.h
|
||||
@@ -1,6 +1,6 @@
|
||||
|
||||
-#ifndef _HGROUP_H
|
||||
-#define _HGROUP_H
|
||||
+#ifndef LAYOUT_HGROUP_H
|
||||
+#define LAYOUT_HGROUP_H
|
||||
#include "MGroup.h"
|
||||
#include <View.h>
|
||||
#if __POWERPC__
|
||||
diff --git a/headers/LayeredGroup.h b/headers/LayeredGroup.h
|
||||
index 7069c1f..2c7ea4d 100644
|
||||
--- a/headers/LayeredGroup.h
|
||||
+++ b/headers/LayeredGroup.h
|
||||
@@ -1,6 +1,6 @@
|
||||
|
||||
-#ifndef _LAYEREDGROUP_H
|
||||
-#define _LAYEREDGROUP_H
|
||||
+#ifndef LAYOUT_LAYEREDGROUP_H
|
||||
+#define LAYOUT_LAYEREDGROUP_H
|
||||
|
||||
#include "MGroup.h"
|
||||
#include <Control.h>
|
||||
diff --git a/headers/MApplication.h b/headers/MApplication.h
|
||||
index e492687..9a1401e 100644
|
||||
--- a/headers/MApplication.h
|
||||
+++ b/headers/MApplication.h
|
||||
@@ -1,6 +1,6 @@
|
||||
|
||||
-#ifndef _MAPPLICATION_H
|
||||
-#define _MAPPLICATION_H
|
||||
+#ifndef LAYOUT_MAPPLICATION_H
|
||||
+#define LAYOUT_MAPPLICATION_H
|
||||
|
||||
#include "layout.h"
|
||||
#include <Application.h>
|
||||
diff --git a/headers/MBViewWrapper.h b/headers/MBViewWrapper.h
|
||||
index 1e19763..d970253 100644
|
||||
--- a/headers/MBViewWrapper.h
|
||||
+++ b/headers/MBViewWrapper.h
|
||||
@@ -1,6 +1,6 @@
|
||||
|
||||
-#ifndef _MBVIEWWRAPPER_H
|
||||
-#define _MBVIEWWRAPPER_H
|
||||
+#ifndef LAYOUT_MBVIEWWRAPPER_H
|
||||
+#define LAYOUT_MBVIEWWRAPPER_H
|
||||
#include "layout.h"
|
||||
#include <View.h>
|
||||
|
||||
diff --git a/headers/MBorder.h b/headers/MBorder.h
|
||||
index 407010e..eb0c9a4 100644
|
||||
--- a/headers/MBorder.h
|
||||
+++ b/headers/MBorder.h
|
||||
@@ -1,6 +1,6 @@
|
||||
|
||||
-#ifndef _MBORDER_H
|
||||
-#define _MBORDER_H
|
||||
+#ifndef LAYOUT_MBORDER_H
|
||||
+#define LAYOUT_MBORDER_H
|
||||
#include "MGroup.h"
|
||||
|
||||
#if __POWERPC__
|
||||
diff --git a/headers/MButton.h b/headers/MButton.h
|
||||
index e6045a6..871bbb7 100644
|
||||
--- a/headers/MButton.h
|
||||
+++ b/headers/MButton.h
|
||||
@@ -1,6 +1,6 @@
|
||||
|
||||
-#ifndef _MBUTTON
|
||||
-#define _MBUTTON
|
||||
+#ifndef LAYOUT_MBUTTON
|
||||
+#define LAYOUT_MBUTTON
|
||||
#include "layout.h"
|
||||
#include <Button.h>
|
||||
|
||||
diff --git a/headers/MCheckBox.h b/headers/MCheckBox.h
|
||||
index 7132acd..0d5d4bf 100644
|
||||
--- a/headers/MCheckBox.h
|
||||
+++ b/headers/MCheckBox.h
|
||||
@@ -1,6 +1,6 @@
|
||||
|
||||
-#ifndef _MCHECKBOX
|
||||
-#define _MCHECKBOX
|
||||
+#ifndef LAYOUT_MCHECKBOX
|
||||
+#define LAYOUT_MCHECKBOX
|
||||
#include "layout.h"
|
||||
#include <CheckBox.h>
|
||||
|
||||
diff --git a/headers/MDividable.h b/headers/MDividable.h
|
||||
index 800772b..7369d32 100644
|
||||
--- a/headers/MDividable.h
|
||||
+++ b/headers/MDividable.h
|
||||
@@ -5,8 +5,8 @@
|
||||
// used to align the left half (the label) and the right
|
||||
// half (data-entry/selection) of a group of MDividable's
|
||||
|
||||
-#ifndef _MDIVIDABLE_H
|
||||
-#define _MDIVIDABLE_H
|
||||
+#ifndef LAYOUT_MDIVIDABLE_H
|
||||
+#define LAYOUT_MDIVIDABLE_H
|
||||
|
||||
#include "layout.h"
|
||||
|
||||
diff --git a/headers/MDragBar.h b/headers/MDragBar.h
|
||||
index 3ad85f5..fe9d5df 100644
|
||||
--- a/headers/MDragBar.h
|
||||
+++ b/headers/MDragBar.h
|
||||
@@ -1,6 +1,6 @@
|
||||
|
||||
-#ifndef _MDRAGBAR_H
|
||||
-#define _MDRAGBAR_H
|
||||
+#ifndef LAYOUT_MDRAGBAR_H
|
||||
+#define LAYOUT_MDRAGBAR_H
|
||||
#include "layout.h"
|
||||
#include <Control.h>
|
||||
|
||||
diff --git a/headers/MEject.h b/headers/MEject.h
|
||||
index cfc9ce2..423f346 100644
|
||||
--- a/headers/MEject.h
|
||||
+++ b/headers/MEject.h
|
||||
@@ -1,5 +1,5 @@
|
||||
-#ifndef _MEJECT_H
|
||||
-#define _MEJECT_H
|
||||
+#ifndef LAYOUT_MEJECT_H
|
||||
+#define LAYOUT_MEJECT_H
|
||||
|
||||
#include "MPictureButton.h"
|
||||
|
||||
diff --git a/headers/MFFWD.h b/headers/MFFWD.h
|
||||
index d2c1549..bd5fae6 100644
|
||||
--- a/headers/MFFWD.h
|
||||
+++ b/headers/MFFWD.h
|
||||
@@ -1,5 +1,5 @@
|
||||
-#ifndef _MFFWD_H
|
||||
-#define _MFFWD_H
|
||||
+#ifndef LAYOUT_MFFWD_H
|
||||
+#define LAYOUT_MFFWD_H
|
||||
|
||||
#include "MPictureButton.h"
|
||||
|
||||
diff --git a/headers/MGroup.h b/headers/MGroup.h
|
||||
index 73dcbfb..743ed0c 100644
|
||||
--- a/headers/MGroup.h
|
||||
+++ b/headers/MGroup.h
|
||||
@@ -4,8 +4,8 @@
|
||||
|
||||
*/
|
||||
|
||||
-#ifndef _MGROUP_H
|
||||
-#define _MGROUP_H
|
||||
+#ifndef LAYOUT_MGROUP_H
|
||||
+#define LAYOUT_MGROUP_H
|
||||
|
||||
#include "layout.h"
|
||||
#include <View.h>
|
||||
diff --git a/headers/MListView.h b/headers/MListView.h
|
||||
index 5b1996b..63687c2 100644
|
||||
--- a/headers/MListView.h
|
||||
+++ b/headers/MListView.h
|
||||
@@ -1,6 +1,6 @@
|
||||
|
||||
-#ifndef _MLISTVIEW_H
|
||||
-#define _MLISTVIEW_H
|
||||
+#ifndef LAYOUT_MLISTVIEW_H
|
||||
+#define LAYOUT_MLISTVIEW_H
|
||||
#include "layout.h"
|
||||
#include <ListView.h>
|
||||
|
||||
diff --git a/headers/MMenuBar.h b/headers/MMenuBar.h
|
||||
index b9fca07..2d47fa4 100644
|
||||
--- a/headers/MMenuBar.h
|
||||
+++ b/headers/MMenuBar.h
|
||||
@@ -1,6 +1,6 @@
|
||||
|
||||
-#ifndef _MMENUBAR_H
|
||||
-#define _MMENUBAR_H
|
||||
+#ifndef LAYOUT_MMENUBAR_H
|
||||
+#define LAYOUT_MMENUBAR_H
|
||||
|
||||
#include "layout.h"
|
||||
#include <MenuBar.h>
|
||||
diff --git a/headers/MNext.h b/headers/MNext.h
|
||||
index 37adf63..2f47b60 100644
|
||||
--- a/headers/MNext.h
|
||||
+++ b/headers/MNext.h
|
||||
@@ -1,5 +1,5 @@
|
||||
-#ifndef _MNEXT_H
|
||||
-#define _MNEXT_H
|
||||
+#ifndef LAYOUT_MNEXT_H
|
||||
+#define LAYOUT_MNEXT_H
|
||||
|
||||
#include "MPictureButton.h"
|
||||
|
||||
diff --git a/headers/MOutlineListView.h b/headers/MOutlineListView.h
|
||||
index 6ff5539..e282e53 100644
|
||||
--- a/headers/MOutlineListView.h
|
||||
+++ b/headers/MOutlineListView.h
|
||||
@@ -1,6 +1,6 @@
|
||||
|
||||
-#ifndef _MOUTLINELISTVIEW_H
|
||||
-#define _MOUTLINELISTVIEW_H
|
||||
+#ifndef LAYOUT_MOUTLINELISTVIEW_H
|
||||
+#define LAYOUT_MOUTLINELISTVIEW_H
|
||||
#include "layout.h"
|
||||
#include <OutlineListView.h>
|
||||
|
||||
diff --git a/headers/MPictureButton.h b/headers/MPictureButton.h
|
||||
index 4c8bbe1..325f0bb 100644
|
||||
--- a/headers/MPictureButton.h
|
||||
+++ b/headers/MPictureButton.h
|
||||
@@ -1,5 +1,5 @@
|
||||
-#ifndef _MPICTUREBUTTON_H
|
||||
-#define _MPICTUREBUTTON_H
|
||||
+#ifndef LAYOUT_MPICTUREBUTTON_H
|
||||
+#define LAYOUT_MPICTUREBUTTON_H
|
||||
|
||||
#include "layout.h"
|
||||
#include <PictureButton.h>
|
||||
diff --git a/headers/MPlayBW.h b/headers/MPlayBW.h
|
||||
index 4e11715..6088961 100644
|
||||
--- a/headers/MPlayBW.h
|
||||
+++ b/headers/MPlayBW.h
|
||||
@@ -1,5 +1,5 @@
|
||||
-#ifndef _MPLAYBW_H
|
||||
-#define _MPLAYBW_H
|
||||
+#ifndef LAYOUT_MPLAYBW_H
|
||||
+#define LAYOUT_MPLAYBW_H
|
||||
|
||||
#include "MPictureButton.h"
|
||||
|
||||
diff --git a/headers/MPlayFW.h b/headers/MPlayFW.h
|
||||
index 0db1623..e893cce 100644
|
||||
--- a/headers/MPlayFW.h
|
||||
+++ b/headers/MPlayFW.h
|
||||
@@ -1,5 +1,5 @@
|
||||
-#ifndef _MPLAYFW_H
|
||||
-#define _MPLAYFW_H
|
||||
+#ifndef LAYOUT_MPLAYFW_H
|
||||
+#define LAYOUT_MPLAYFW_H
|
||||
|
||||
#include "MPictureButton.h"
|
||||
|
||||
diff --git a/headers/MPopup.h b/headers/MPopup.h
|
||||
index 084c145..1196b56 100644
|
||||
--- a/headers/MPopup.h
|
||||
+++ b/headers/MPopup.h
|
||||
@@ -1,6 +1,6 @@
|
||||
|
||||
-#ifndef _MPOPUP_H
|
||||
-#define _MPOPUP_H
|
||||
+#ifndef LAYOUT_MPOPUP_H
|
||||
+#define LAYOUT_MPOPUP_H
|
||||
#include "layout.h"
|
||||
#include "MDividable.h"
|
||||
#include <MenuField.h>
|
||||
diff --git a/headers/MPrev.h b/headers/MPrev.h
|
||||
index 533b074..a3834e8 100644
|
||||
--- a/headers/MPrev.h
|
||||
+++ b/headers/MPrev.h
|
||||
@@ -1,5 +1,5 @@
|
||||
-#ifndef _MPREV_H
|
||||
-#define _MPREV_H
|
||||
+#ifndef LAYOUT_MPREV_H
|
||||
+#define LAYOUT_MPREV_H
|
||||
|
||||
#include "MPictureButton.h"
|
||||
|
||||
diff --git a/headers/MProgressBar.h b/headers/MProgressBar.h
|
||||
index 3de8977..6612468 100644
|
||||
--- a/headers/MProgressBar.h
|
||||
+++ b/headers/MProgressBar.h
|
||||
@@ -1,6 +1,6 @@
|
||||
|
||||
-#ifndef _MSTATUSBAR_H
|
||||
-#define _MSTATUSBAR_H
|
||||
+#ifndef LAYOUT_MSTATUSBAR_H
|
||||
+#define LAYOUT_MSTATUSBAR_H
|
||||
#include "layout.h"
|
||||
#include <View.h>
|
||||
|
||||
diff --git a/headers/MRadioGroup.h b/headers/MRadioGroup.h
|
||||
index ffa7c32..0895c34 100644
|
||||
--- a/headers/MRadioGroup.h
|
||||
+++ b/headers/MRadioGroup.h
|
||||
@@ -1,6 +1,6 @@
|
||||
|
||||
-#ifndef _MRADIOGROUP_H
|
||||
-#define _MRADIOGROUP_H
|
||||
+#ifndef LAYOUT_MRADIOGROUP_H
|
||||
+#define LAYOUT_MRADIOGROUP_H
|
||||
#include "MGroup.h"
|
||||
#include <RadioButton.h>
|
||||
|
||||
diff --git a/headers/MRew.h b/headers/MRew.h
|
||||
index 93d9a58..32717b3 100644
|
||||
--- a/headers/MRew.h
|
||||
+++ b/headers/MRew.h
|
||||
@@ -1,5 +1,5 @@
|
||||
-#ifndef _MREW_H
|
||||
-#define _MREW_H
|
||||
+#ifndef LAYOUT_MREW_H
|
||||
+#define LAYOUT_MREW_H
|
||||
|
||||
#include "MPictureButton.h"
|
||||
|
||||
diff --git a/headers/MScrollView.h b/headers/MScrollView.h
|
||||
index d2ece01..b5128a0 100644
|
||||
--- a/headers/MScrollView.h
|
||||
+++ b/headers/MScrollView.h
|
||||
@@ -1,6 +1,6 @@
|
||||
|
||||
-#ifndef _MSCROLLVIEW_H
|
||||
-#define _MSCROLLVIEW_H
|
||||
+#ifndef LAYOUT_MSCROLLVIEW_H
|
||||
+#define LAYOUT_MSCROLLVIEW_H
|
||||
|
||||
#include "layout.h"
|
||||
#include <ScrollView.h>
|
||||
diff --git a/headers/MSlider.h b/headers/MSlider.h
|
||||
index 6e7077d..0e9d6f2 100644
|
||||
--- a/headers/MSlider.h
|
||||
+++ b/headers/MSlider.h
|
||||
@@ -1,7 +1,7 @@
|
||||
|
||||
|
||||
-#ifndef _MSLIDER_H
|
||||
-#define _MSLIDER_H
|
||||
+#ifndef LAYOUT_MSLIDER_H
|
||||
+#define LAYOUT_MSLIDER_H
|
||||
|
||||
#include "layout.h"
|
||||
#include "Slider.h"
|
||||
diff --git a/headers/MSplitter.h b/headers/MSplitter.h
|
||||
index 6fa9021..366e362 100644
|
||||
--- a/headers/MSplitter.h
|
||||
+++ b/headers/MSplitter.h
|
||||
@@ -1,6 +1,6 @@
|
||||
|
||||
-#ifndef _MSPLITTER_H
|
||||
-#define _MSPLITTER_H
|
||||
+#ifndef LAYOUT_MSPLITTER_H
|
||||
+#define LAYOUT_MSPLITTER_H
|
||||
|
||||
#include "layout.h"
|
||||
|
||||
diff --git a/headers/MStop.h b/headers/MStop.h
|
||||
index 2236cb1..5016f80 100644
|
||||
--- a/headers/MStop.h
|
||||
+++ b/headers/MStop.h
|
||||
@@ -1,5 +1,5 @@
|
||||
-#ifndef _MSTOP_H
|
||||
-#define _MSTOP_H
|
||||
+#ifndef LAYOUT_MSTOP_H
|
||||
+#define LAYOUT_MSTOP_H
|
||||
|
||||
#include "MPictureButton.h"
|
||||
|
||||
diff --git a/headers/MStringView.h b/headers/MStringView.h
|
||||
index a74c430..fe38ae6 100644
|
||||
--- a/headers/MStringView.h
|
||||
+++ b/headers/MStringView.h
|
||||
@@ -1,6 +1,6 @@
|
||||
|
||||
-#ifndef _MSTRINGVIEW_H
|
||||
-#define _MSTRINGVIEW_H
|
||||
+#ifndef LAYOUT_MSTRINGVIEW_H
|
||||
+#define LAYOUT_MSTRINGVIEW_H
|
||||
#include "layout.h"
|
||||
#include <StringView.h>
|
||||
|
||||
diff --git a/headers/MTabView.h b/headers/MTabView.h
|
||||
index 04c69ec..b67ad2b 100644
|
||||
--- a/headers/MTabView.h
|
||||
+++ b/headers/MTabView.h
|
||||
@@ -1,6 +1,6 @@
|
||||
|
||||
-#ifndef _MTABVIEW_H
|
||||
-#define _MTABVIEW_H
|
||||
+#ifndef LAYOUT_MTABVIEW_H
|
||||
+#define LAYOUT_MTABVIEW_H
|
||||
|
||||
#include <TabView.h>
|
||||
#include "MGroup.h"
|
||||
diff --git a/headers/MTextControl.h b/headers/MTextControl.h
|
||||
index 3dd568d..5aafdda 100644
|
||||
--- a/headers/MTextControl.h
|
||||
+++ b/headers/MTextControl.h
|
||||
@@ -1,6 +1,6 @@
|
||||
|
||||
-#ifndef _MTEXTCONTROL_H
|
||||
-#define _MTEXTCONTROL_H
|
||||
+#ifndef LAYOUT_MTEXTCONTROL_H
|
||||
+#define LAYOUT_MTEXTCONTROL_H
|
||||
#include "layout.h"
|
||||
#include "MDividable.h"
|
||||
#include <TextControl.h>
|
||||
diff --git a/headers/MTextView.h b/headers/MTextView.h
|
||||
index 6b39719..f8761d7 100644
|
||||
--- a/headers/MTextView.h
|
||||
+++ b/headers/MTextView.h
|
||||
@@ -1,6 +1,6 @@
|
||||
|
||||
-#ifndef _MTEXTVIEW_H
|
||||
-#define _MTEXTVIEW_H
|
||||
+#ifndef LAYOUT_MTEXTVIEW_H
|
||||
+#define LAYOUT_MTEXTVIEW_H
|
||||
#include "layout.h"
|
||||
#include <TextView.h>
|
||||
|
||||
diff --git a/headers/MVolume.h b/headers/MVolume.h
|
||||
index 34e7660..5fb8f89 100644
|
||||
--- a/headers/MVolume.h
|
||||
+++ b/headers/MVolume.h
|
||||
@@ -1,5 +1,5 @@
|
||||
-#ifndef _MVOLUME_H
|
||||
-#define _MVOLUME_H
|
||||
+#ifndef LAYOUT_MVOLUME_H
|
||||
+#define LAYOUT_MVOLUME_H
|
||||
|
||||
#include "layout.h"
|
||||
#include <Control.h>
|
||||
diff --git a/headers/MWindow.h b/headers/MWindow.h
|
||||
index fd97428..4f93445 100644
|
||||
--- a/headers/MWindow.h
|
||||
+++ b/headers/MWindow.h
|
||||
@@ -1,6 +1,6 @@
|
||||
|
||||
-#ifndef _MWINDOW_H
|
||||
-#define _MWINDOW_H
|
||||
+#ifndef LAYOUT_MWINDOW_H
|
||||
+#define LAYOUT_MWINDOW_H
|
||||
|
||||
#include "layout.h"
|
||||
#include <Window.h>
|
||||
diff --git a/headers/PropGadget.h b/headers/PropGadget.h
|
||||
index a39cf61..261a648 100644
|
||||
--- a/headers/PropGadget.h
|
||||
+++ b/headers/PropGadget.h
|
||||
@@ -1,6 +1,6 @@
|
||||
|
||||
-#ifndef _PROPGADGET
|
||||
-#define _PROPGADGET
|
||||
+#ifndef LAYOUT_PROPGADGET
|
||||
+#define LAYOUT_PROPGADGET
|
||||
#include "layout.h"
|
||||
#include <Control.h>
|
||||
#include <Bitmap.h>
|
||||
diff --git a/headers/Space.h b/headers/Space.h
|
||||
index cca7b25..e26802c 100644
|
||||
--- a/headers/Space.h
|
||||
+++ b/headers/Space.h
|
||||
@@ -1,6 +1,6 @@
|
||||
|
||||
-#ifndef _SPACE_H
|
||||
-#define _SPACE_H
|
||||
+#ifndef LAYOUT_SPACE_H
|
||||
+#define LAYOUT_SPACE_H
|
||||
#include "layout.h"
|
||||
#include "View.h"
|
||||
|
||||
diff --git a/headers/SpinButton.h b/headers/SpinButton.h
|
||||
index 3bb00db..4f4d0b6 100644
|
||||
--- a/headers/SpinButton.h
|
||||
+++ b/headers/SpinButton.h
|
||||
@@ -1,6 +1,6 @@
|
||||
|
||||
-#ifndef _SPINBUTTON_H
|
||||
-#define _SPINBUTTON_H
|
||||
+#ifndef LAYOUT_SPINBUTTON_H
|
||||
+#define LAYOUT_SPINBUTTON_H
|
||||
|
||||
#include <View.h>
|
||||
#include "layout.h"
|
||||
diff --git a/headers/TabGroup.h b/headers/TabGroup.h
|
||||
index 827ca9e..e132b8d 100644
|
||||
--- a/headers/TabGroup.h
|
||||
+++ b/headers/TabGroup.h
|
||||
@@ -1,6 +1,6 @@
|
||||
|
||||
-#ifndef _TABGROUP_H
|
||||
-#define _TABGROUP_H
|
||||
+#ifndef LAYOUT_TABGROUP_H
|
||||
+#define LAYOUT_TABGROUP_H
|
||||
|
||||
#include "MGroup.h"
|
||||
#include <Control.h>
|
||||
diff --git a/headers/VGroup.h b/headers/VGroup.h
|
||||
index 42b02ba..6e4d509 100644
|
||||
--- a/headers/VGroup.h
|
||||
+++ b/headers/VGroup.h
|
||||
@@ -1,6 +1,6 @@
|
||||
|
||||
-#ifndef _VGROUP_H
|
||||
-#define _VGROUP_H
|
||||
+#ifndef LAYOUT_VGROUP_H
|
||||
+#define LAYOUT_VGROUP_H
|
||||
#include "MGroup.h"
|
||||
#include <View.h>
|
||||
|
||||
diff --git a/headers/layout.h b/headers/layout.h
|
||||
index 772b251..7a478ac 100644
|
||||
--- a/headers/layout.h
|
||||
+++ b/headers/layout.h
|
||||
@@ -6,8 +6,8 @@
|
||||
|
||||
*/
|
||||
|
||||
-#ifndef _LAYOUT_H
|
||||
-#define _LAYOUT_H
|
||||
+#ifndef LAYOUT_LAYOUT_H
|
||||
+#define LAYOUT_LAYOUT_H
|
||||
|
||||
#if __POWERPC__
|
||||
#pragma simple_class_byval off
|
||||
--
|
||||
2.45.2
|
||||
|
||||
Reference in New Issue
Block a user