You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by xi...@apache.org on 2022/01/16 09:36:26 UTC
[incubator-nuttx-apps] branch master updated: include: fix double include pre-processor guards
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git
The following commit(s) were added to refs/heads/master by this push:
new 9480c0e include: fix double include pre-processor guards
9480c0e is described below
commit 9480c0ec12eb6238aaeed1b4a9eef38a1b7af675
Author: Petro Karashchenko <pe...@gmail.com>
AuthorDate: Sun Jan 16 04:31:55 2022 +0200
include: fix double include pre-processor guards
Signed-off-by: Petro Karashchenko <pe...@gmail.com>
---
examples/camera/camera_fileutil.h | 6 +++---
examples/dhcpd/dhcpd_daemon.h | 6 +++---
examples/elf/tests/struct/struct.h | 8 ++++----
examples/flowc/flowc.h | 6 +++---
examples/foc/foc_adc.h | 6 +++---
examples/foc/foc_cfg.h | 6 +++---
examples/foc/foc_debug.h | 6 +++---
examples/foc/foc_device.h | 6 +++---
examples/foc/foc_intf.h | 6 +++---
examples/foc/foc_motor_b16.h | 6 +++---
examples/foc/foc_motor_f32.h | 6 +++---
examples/foc/foc_mq.h | 6 +++---
examples/foc/foc_parseargs.h | 6 +++---
examples/foc/foc_thr.h | 6 +++---
examples/mount/mount.h | 6 +++---
examples/nettest/nettest.h | 10 ++++-----
examples/nrf24l01_btle/nrf24l01_btle.h | 6 +++---
examples/nx/nx_internal.h | 24 ++++++++++++----------
examples/nxflat/tests/struct/struct.h | 8 ++++----
examples/nxterm/nxterm_internal.h | 8 +++++---
examples/nxtext/nxtext_internal.h | 6 +++---
examples/pf_ieee802154/pfieee802154.h | 6 +++---
examples/pipe/pipe.h | 6 +++---
examples/poll/poll_internal.h | 6 +++---
examples/pwfb/pwfb_internal.h | 6 +++---
examples/pwlines/pwlines_internal.h | 6 +++---
examples/tcpblaster/tcpblaster.h | 6 +++---
examples/udgram/udgram.h | 6 +++---
examples/udp/udp.h | 6 +++---
examples/udpblaster/udpblaster.h | 6 +++---
examples/usrsocktest/defines.h | 6 +++---
examples/ustream/ustream.h | 6 +++---
examples/watched/watched.h | 6 +++---
examples/watcher/ramdisk.h | 6 +++---
examples/watcher/task_mn.h | 6 +++---
examples/watcher/wdt.h | 6 +++---
examples/webserver/cgi.h | 6 +++---
graphics/lvgl/lv_fs_interface.h | 6 +++---
graphics/lvgl/lv_tick_interface.h | 6 +++---
.../nxwidgets/UnitTests/CButton/cbuttontest.hxx | 6 +++---
.../UnitTests/CButtonArray/cbuttonarraytest.hxx | 6 +++---
.../UnitTests/CCheckBox/ccheckboxtest.hxx | 6 +++---
.../UnitTests/CGlyphButton/cglyphbuttontest.hxx | 6 +++---
.../cglyphsliderhorizontaltest.hxx | 6 +++---
graphics/nxwidgets/UnitTests/CImage/cimagetest.hxx | 6 +++---
.../nxwidgets/UnitTests/CKeypad/ckeypadtest.hxx | 6 +++---
graphics/nxwidgets/UnitTests/CLabel/clabeltest.hxx | 6 +++---
.../UnitTests/CLatchButton/clatchbuttontest.hxx | 6 +++---
.../CLatchButtonArray/clatchbuttonarraytest.hxx | 6 +++---
.../nxwidgets/UnitTests/CListBox/clistboxtest.hxx | 6 +++---
.../UnitTests/CProgressBar/cprogressbartest.hxx | 6 +++---
.../UnitTests/CRadioButton/cradiobuttontest.hxx | 6 +++---
.../cscrollbarhorizontaltest.hxx | 6 +++---
.../CScrollbarVertical/cscrollbarverticaltest.hxx | 6 +++---
.../CSliderHorizonal/csliderhorizontaltest.hxx | 6 +++---
.../CSliderVertical/csliderverticaltest.hxx | 6 +++---
.../nxwidgets/UnitTests/CTextBox/ctextboxtest.hxx | 6 +++---
include/graphics/nxwm/capplicationwindow.hxx | 6 +++---
include/graphics/nxwm/cfullscreenwindow.hxx | 6 +++---
include/graphics/nxwm/ckeyboard.hxx | 6 +++---
include/graphics/nxwm/cstartwindow.hxx | 6 +++---
include/graphics/nxwm/ctaskbar.hxx | 6 +++---
include/graphics/nxwm/iapplication.hxx | 6 +++---
include/graphics/nxwm/iapplicationwindow.hxx | 6 +++---
include/graphics/slcd.hxx | 6 +++---
netutils/iperf/iperf.h | 6 +++---
netutils/libcurl4nx/curl4nx_private.h | 6 +++---
netutils/tftpc/tftpc_internal.h | 6 +++---
netutils/thttpd/config.h | 8 ++++----
netutils/thttpd/fdwatch.h | 10 ++++-----
netutils/thttpd/libhttpd.h | 8 ++++----
netutils/thttpd/mime_types.h | 6 +++---
netutils/thttpd/tdate_parse.h | 10 ++++-----
netutils/thttpd/thttpd_alloc.h | 6 +++---
netutils/thttpd/thttpd_cgi.h | 6 +++---
netutils/thttpd/thttpd_strings.h | 10 ++++-----
netutils/thttpd/timers.h | 8 ++++----
netutils/usrsock_rpmsg/usrsock_rpmsg.h | 6 +++---
system/cu/cu.h | 6 +++---
wireless/bluetooth/btsak/btsak.h | 6 +++---
wireless/ieee802154/i8sak/i8sak.h | 6 +++---
wireless/ieee802154/i8sak/i8sak_events.h | 12 ++++++-----
82 files changed, 275 insertions(+), 269 deletions(-)
diff --git a/examples/camera/camera_fileutil.h b/examples/camera/camera_fileutil.h
index 0340f95..5e366d9 100644
--- a/examples/camera/camera_fileutil.h
+++ b/examples/camera/camera_fileutil.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __EXAMPLES_CAMERA_CAMERA_FILEUTIL_H__
-#define __EXAMPLES_CAMERA_CAMERA_FILEUTIL_H__
+#ifndef __APPS_EXAMPLES_CAMERA_CAMERA_FILEUTIL_H
+#define __APPS_EXAMPLES_CAMERA_CAMERA_FILEUTIL_H
/****************************************************************************
* Included Files
@@ -40,5 +40,5 @@ const char *futil_initialize(void);
int futil_writeimage(uint8_t *data, size_t len, const char *fsuffix);
-#endif /* __EXAMPLES_CAMERA_CAMERA_FILEUTIL_H__ */
+#endif /* __APPS_EXAMPLES_CAMERA_CAMERA_FILEUTIL_H */
diff --git a/examples/dhcpd/dhcpd_daemon.h b/examples/dhcpd/dhcpd_daemon.h
index b5692d83..5c2e521 100644
--- a/examples/dhcpd/dhcpd_daemon.h
+++ b/examples/dhcpd/dhcpd_daemon.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __APPS_EXAMPLES_DHCPD_DHCPD_RUN_H
-#define __APPS_EXAMPLES_DHCPD_DHCPD_RUN_H
+#ifndef __APPS_EXAMPLES_DHCPD_DHCPD_DAEMON_H
+#define __APPS_EXAMPLES_DHCPD_DHCPD_DAEMON_H
/****************************************************************************
* Included Files
@@ -52,4 +52,4 @@ int dhcpd_daemon(int argc, FAR char *argv[], bool daemon);
}
#endif
-#endif /* __APPS_EXAMPLES_DHCPD_DHCPD_RUN_H */
+#endif /* __APPS_EXAMPLES_DHCPD_DHCPD_DAEMON_H */
diff --git a/examples/elf/tests/struct/struct.h b/examples/elf/tests/struct/struct.h
index ec96db7..7508f05 100644
--- a/examples/elf/tests/struct/struct.h
+++ b/examples/elf/tests/struct/struct.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __EXAMPLES_ELF_TESTS_STRUCT_STRUCT_H
-#define __EXAMPLES_ELF_TESTS_STRUCT_STRUCT_H
+#ifndef __APPS_EXAMPLES_ELF_TESTS_STRUCT_STRUCT_H
+#define __APPS_EXAMPLES_ELF_TESTS_STRUCT_STRUCT_H
/****************************************************************************
* Included Files
@@ -63,10 +63,10 @@ extern int dummy_scalar; /* (DUMMY_SCALAR_VALUE2) */
extern const struct struct_dummy_s dummy_struct;
/****************************************************************************
- * Public Functions
+ * Public Function Prototypes
****************************************************************************/
extern void dummyfunc(void);
extern const struct struct_s *getstruct(void);
-#endif /* __EXAMPLES_ELF_TESTS_STRUCT_STRUCT_H */
+#endif /* __APPS_EXAMPLES_ELF_TESTS_STRUCT_STRUCT_H */
diff --git a/examples/flowc/flowc.h b/examples/flowc/flowc.h
index 0129dc3..2e7bd07 100644
--- a/examples/flowc/flowc.h
+++ b/examples/flowc/flowc.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __EXAMPLES_FLOWC_FLOWC_H
-#define __EXAMPLES_FLOWC_FLOWC_H
+#ifndef __APPS_EXAMPLES_FLOWC_FLOWC_H
+#define __APPS_EXAMPLES_FLOWC_FLOWC_H
/****************************************************************************
* Included Files
@@ -54,4 +54,4 @@
int flowc_sender(int argc, char **argv);
int flowc_receiver(int argc, char **argv);
-#endif /* __EXAMPLES_FLOWC_FLOWC_H */
+#endif /* __APPS_EXAMPLES_FLOWC_FLOWC_H */
diff --git a/examples/foc/foc_adc.h b/examples/foc/foc_adc.h
index deafd8c..d578d1f 100644
--- a/examples/foc/foc_adc.h
+++ b/examples/foc/foc_adc.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __EXAMPLES_FOC_FOC_ADC_H
-#define __EXAMPLES_FOC_FOC_ADC_H
+#ifndef __APPS_EXAMPLES_FOC_FOC_ADC_H
+#define __APPS_EXAMPLES_FOC_FOC_ADC_H
/****************************************************************************
* Included Files
@@ -67,4 +67,4 @@
#endif /* CONFIG_EXAMPLES_FOC_HAVE_ADC */
-#endif /* __EXAMPLES_FOC_FOC_ADC_H */
+#endif /* __APPS_EXAMPLES_FOC_FOC_ADC_H */
diff --git a/examples/foc/foc_cfg.h b/examples/foc/foc_cfg.h
index 8aae491..e4a7832 100644
--- a/examples/foc/foc_cfg.h
+++ b/examples/foc/foc_cfg.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __EXAMPLES_FOC_FOC_CFG_H
-#define __EXAMPLES_FOC_FOC_CFG_H
+#ifndef __APPS_EXAMPLES_FOC_FOC_CFG_H
+#define __APPS_EXAMPLES_FOC_FOC_CFG_H
/****************************************************************************
* Included Files
@@ -184,4 +184,4 @@
# endif
#endif
-#endif /* __EXAMPLES_FOC_FOC_CFG_H */
+#endif /* __APPS_EXAMPLES_FOC_FOC_CFG_H */
diff --git a/examples/foc/foc_debug.h b/examples/foc/foc_debug.h
index ac765cf..fd92d24 100644
--- a/examples/foc/foc_debug.h
+++ b/examples/foc/foc_debug.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __EXAMPLES_FOC_FOC_DEBUG_H
-#define __EXAMPLES_FOC_FOC_DEBUG_H
+#ifndef __APPS_EXAMPLES_FOC_FOC_DEBUG_H
+#define __APPS_EXAMPLES_FOC_FOC_DEBUG_H
/****************************************************************************
* Included Files
@@ -57,4 +57,4 @@
# endif
#endif
-#endif /* __EXAMPLES_FOC_FOC_DEBUG_H */
+#endif /* __APPS_EXAMPLES_FOC_FOC_DEBUG_H */
diff --git a/examples/foc/foc_device.h b/examples/foc/foc_device.h
index f77c9be..1b46b9c 100644
--- a/examples/foc/foc_device.h
+++ b/examples/foc/foc_device.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __EXAMPLES_FOC_FOC_DEVICE_H
-#define __EXAMPLES_FOC_FOC_DEVICE_H
+#ifndef __APPS_EXAMPLES_FOC_FOC_DEVICE_H
+#define __APPS_EXAMPLES_FOC_FOC_DEVICE_H
/****************************************************************************
* Included Files
@@ -58,4 +58,4 @@ int foc_dev_state_get(FAR struct foc_device_s *dev);
int foc_dev_params_set(FAR struct foc_device_s *dev);
int foc_dev_state_handle(FAR struct foc_device_s *dev, FAR bool *flag);
-#endif /* __EXAMPLES_FOC_FOC_DEVICE_H */
+#endif /* __APPS_EXAMPLES_FOC_FOC_DEVICE_H */
diff --git a/examples/foc/foc_intf.h b/examples/foc/foc_intf.h
index fb9e7e0..2868983 100644
--- a/examples/foc/foc_intf.h
+++ b/examples/foc/foc_intf.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __EXAMPLES_FOC_FOC_INTF_H
-#define __EXAMPLES_FOC_FOC_INTF_H
+#ifndef __APPS_EXAMPLES_FOC_FOC_INTF_H
+#define __APPS_EXAMPLES_FOC_FOC_INTF_H
/****************************************************************************
* Included Files
@@ -57,4 +57,4 @@ int foc_intf_init(void);
int foc_intf_deinit(void);
int foc_intf_update(FAR struct foc_intf_data_s *data);
-#endif /* __EXAMPLES_FOC_FOC_INTF_H */
+#endif /* __APPS_EXAMPLES_FOC_FOC_INTF_H */
diff --git a/examples/foc/foc_motor_b16.h b/examples/foc/foc_motor_b16.h
index 86bc5e5..ea7f289 100644
--- a/examples/foc/foc_motor_b16.h
+++ b/examples/foc/foc_motor_b16.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __EXAMPLES_FOC_FOC_MOTOR_B16_H
-#define __EXAMPLES_FOC_FOC_MOTOR_B16_H
+#ifndef __APPS_EXAMPLES_FOC_FOC_MOTOR_B16_H
+#define __APPS_EXAMPLES_FOC_FOC_MOTOR_B16_H
/****************************************************************************
* Included Files
@@ -130,4 +130,4 @@ int foc_motor_control(FAR struct foc_motor_b16_s *motor);
int foc_motor_handle(FAR struct foc_motor_b16_s *motor,
FAR struct foc_mq_s *handle);
-#endif /* __EXAMPLES_FOC_FOC_MOTOR_B16_H */
+#endif /* __APPS_EXAMPLES_FOC_FOC_MOTOR_B16_H */
diff --git a/examples/foc/foc_motor_f32.h b/examples/foc/foc_motor_f32.h
index d07f361..625c522 100644
--- a/examples/foc/foc_motor_f32.h
+++ b/examples/foc/foc_motor_f32.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __EXAMPLES_FOC_FOC_MOTOR_F32_H
-#define __EXAMPLES_FOC_FOC_MOTOR_F32_H
+#ifndef __APPS_EXAMPLES_FOC_FOC_MOTOR_F32_H
+#define __APPS_EXAMPLES_FOC_FOC_MOTOR_F32_H
/****************************************************************************
* Included Files
@@ -130,4 +130,4 @@ int foc_motor_control(FAR struct foc_motor_f32_s *motor);
int foc_motor_handle(FAR struct foc_motor_f32_s *motor,
FAR struct foc_mq_s *handle);
-#endif /* __EXAMPLES_FOC_FOC_MOTOR_F32_H */
+#endif /* __APPS_EXAMPLES_FOC_FOC_MOTOR_F32_H */
diff --git a/examples/foc/foc_mq.h b/examples/foc/foc_mq.h
index 4c94c93..e096d0c 100644
--- a/examples/foc/foc_mq.h
+++ b/examples/foc/foc_mq.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __EXAMPLES_FOC_FOC_MQ_H
-#define __EXAMPLES_FOC_FOC_MQ_H
+#ifndef __APPS_EXAMPLES_FOC_FOC_MQ_H
+#define __APPS_EXAMPLES_FOC_FOC_MQ_H
/****************************************************************************
* Included Files
@@ -80,4 +80,4 @@ struct foc_mq_s
int foc_mq_handle(mqd_t mq, FAR struct foc_mq_s *h);
-#endif /* __EXAMPLES_FOC_FOC_THR_H */
+#endif /* __APPS_EXAMPLES_FOC_FOC_THR_H */
diff --git a/examples/foc/foc_parseargs.h b/examples/foc/foc_parseargs.h
index c783356..9046175 100644
--- a/examples/foc/foc_parseargs.h
+++ b/examples/foc/foc_parseargs.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __EXAMPLES_FOC_FOC_PARSEARGS_H
-#define __EXAMPLES_FOC_FOC_PARSEARGS_H
+#ifndef __APPS_EXAMPLES_FOC_FOC_PARSEARGS_H
+#define __APPS_EXAMPLES_FOC_FOC_PARSEARGS_H
/****************************************************************************
* Included Files
@@ -76,4 +76,4 @@ struct args_s
void parse_args(FAR struct args_s *args, int argc, FAR char **argv);
-#endif /* __EXAMPLES_FOC_FOC_THR_H */
+#endif /* __APPS_EXAMPLES_FOC_FOC_THR_H */
diff --git a/examples/foc/foc_thr.h b/examples/foc/foc_thr.h
index aaa8ae5..04e4b49 100644
--- a/examples/foc/foc_thr.h
+++ b/examples/foc/foc_thr.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __EXAMPLES_FOC_FOC_THR_H
-#define __EXAMPLES_FOC_FOC_THR_H
+#ifndef __APPS_EXAMPLES_FOC_FOC_THR_H
+#define __APPS_EXAMPLES_FOC_FOC_THR_H
/****************************************************************************
* Included Files
@@ -129,4 +129,4 @@ bool foc_threads_terminated(void);
int foc_ctrlthr_init(FAR struct foc_ctrl_env_s *foc, int i, FAR mqd_t *mqd,
FAR pthread_t *thread);
-#endif /* __EXAMPLES_FOC_FOC_THR_H */
+#endif /* __APPS_EXAMPLES_FOC_FOC_THR_H */
diff --git a/examples/mount/mount.h b/examples/mount/mount.h
index d8a4c98..a1ac412 100644
--- a/examples/mount/mount.h
+++ b/examples/mount/mount.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __EXAMPLES_MOUNT_MOUNT_H
-#define __EXAMPLES_MOUNT_MOUNT_H
+#ifndef __APPS_EXAMPLES_MOUNT_MOUNT_H
+#define __APPS_EXAMPLES_MOUNT_MOUNT_H
/****************************************************************************
* Included Files
@@ -74,4 +74,4 @@ extern const char g_source[]; /* Mount 'source' path */
extern int create_ramdisk(void);
#endif
-#endif /* __EXAMPLES_MOUNT_MOUNT_H */
+#endif /* __APPS_EXAMPLES_MOUNT_MOUNT_H */
diff --git a/examples/nettest/nettest.h b/examples/nettest/nettest.h
index 03cc674..9a9e8bd 100644
--- a/examples/nettest/nettest.h
+++ b/examples/nettest/nettest.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __EXAMPLES_NETTEST_H
-#define __EXAMPLES_NETTEST_H
+#ifndef __APPS_EXAMPLES_NETTEST_NETTEST_H
+#define __APPS_EXAMPLES_NETTEST_NETTEST_H
/****************************************************************************
* Included Files
@@ -37,14 +37,14 @@
****************************************************************************/
#ifdef NETTEST_HOST
- /* HTONS/L macros are unique to uIP */
+/* HTONS/L macros are unique to uIP */
# undef HTONS
# undef HTONL
# define HTONS(a) htons(a)
# define HTONL(a) htonl(a)
- /* Have SO_LINGER */
+/* Have SO_LINGER */
# define NETTEST_HAVE_SOLINGER 1
@@ -96,4 +96,4 @@ void nettest_cmdline(int argc, char **argv);
extern void nettest_client(void);
extern void nettest_server(void);
-#endif /* __EXAMPLES_NETTEST_H */
+#endif /* __APPS_EXAMPLES_NETTEST_NETTEST_H */
diff --git a/examples/nrf24l01_btle/nrf24l01_btle.h b/examples/nrf24l01_btle/nrf24l01_btle.h
index 888cf91..04c8230 100644
--- a/examples/nrf24l01_btle/nrf24l01_btle.h
+++ b/examples/nrf24l01_btle/nrf24l01_btle.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __EXAMPLES_NRF24L01_BTLE_H
-#define __EXAMPLES_NRF24L01_BTLE_H
+#ifndef __APPS_EXAMPLES_NRF24L01_BTLE_NRF24L01_BTLE_H
+#define __APPS_EXAMPLES_NRF24L01_BTLE_NRF24L01_BTLE_H
/****************************************************************************
* Included Files
@@ -96,4 +96,4 @@ int nrf24_open(void);
int nrf24_send(int wl_fd, uint8_t * buf, uint8_t len);
-#endif /* __EXAMPLES_NRF24L01_BTLE_H */
+#endif /* __APPS_EXAMPLES_NRF24L01_BTLE_NRF24L01_BTLE_H */
diff --git a/examples/nx/nx_internal.h b/examples/nx/nx_internal.h
index beb806f..9064661 100644
--- a/examples/nx/nx_internal.h
+++ b/examples/nx/nx_internal.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __EXAMPLES_NX_NX_INTERNAL_H
-#define __EXAMPLES_NX_NX_INTERNAL_H
+#ifndef __APPS_EXAMPLES_NX_NX_INTERNAL_H
+#define __APPS_EXAMPLES_NX_NX_INTERNAL_H
/****************************************************************************
* Included Files
@@ -200,16 +200,16 @@ struct nxeg_bitmap_s
struct nxeg_state_s
{
- uint8_t wnum; /* Window number */
+ uint8_t wnum; /* Window number */
nxgl_mxpixel_t color[CONFIG_NX_NPLANES]; /* Window color */
#ifdef CONFIG_NX_KBD
- uint8_t height; /* Max height of a font in pixels */
- uint8_t width; /* Max width of a font in pixels */
- uint8_t spwidth; /* The width of a space */
+ uint8_t height; /* Max height of a font in pixels */
+ uint8_t width; /* Max width of a font in pixels */
+ uint8_t spwidth; /* The width of a space */
- uint8_t nchars; /* Number of KBD chars received */
- uint8_t nglyphs; /* Number of glyphs cached */
+ uint8_t nchars; /* Number of KBD chars received */
+ uint8_t nglyphs; /* Number of glyphs cached */
struct nxeg_bitmap_s bm[NXTK_MAXKBDCHARS];
struct nxeg_glyph_s glyph[NXTK_MAXKBDCHARS];
@@ -259,12 +259,14 @@ extern nxgl_mxpixel_t g_tbcolor[CONFIG_NX_NPLANES];
FAR void *nx_listenerthread(FAR void *arg);
#ifdef CONFIG_NX_KBD
-void nxeg_kbdin(NXWINDOW hwnd, uint8_t nch, const uint8_t *ch, FAR void *arg);
+void nxeg_kbdin(NXWINDOW hwnd, uint8_t nch, const uint8_t *ch,
+ FAR void *arg);
#ifndef CONFIG_EXAMPLES_NX_RAWWINDOWS
-void nxeg_tbkbdin(NXWINDOW hwnd, uint8_t nch, const uint8_t *ch, FAR void *arg);
+void nxeg_tbkbdin(NXWINDOW hwnd, uint8_t nch, const uint8_t *ch,
+ FAR void *arg);
#endif
void nxeg_filltext(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect,
FAR struct nxeg_state_s *st);
#endif
-#endif /* __EXAMPLES_NX_NX_INTERNAL_H */
+#endif /* __APPS_EXAMPLES_NX_NX_INTERNAL_H */
diff --git a/examples/nxflat/tests/struct/struct.h b/examples/nxflat/tests/struct/struct.h
index 9fcf53e..1afd0c5 100644
--- a/examples/nxflat/tests/struct/struct.h
+++ b/examples/nxflat/tests/struct/struct.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __EXAMPLES_NXFLAT_TESTS_STRUCT_STRUCT_H
-#define __EXAMPLES_NXFLAT_TESTS_STRUCT_STRUCT_H
+#ifndef __APPS_EXAMPLES_NXFLAT_TESTS_STRUCT_STRUCT_H
+#define __APPS_EXAMPLES_NXFLAT_TESTS_STRUCT_STRUCT_H
/****************************************************************************
* Included Files
@@ -63,10 +63,10 @@ extern int dummy_scalar; /* (DUMMY_SCALAR_VALUE2) */
extern const struct struct_dummy_s dummy_struct;
/****************************************************************************
- * Public Functions
+ * Public Function Prototypes
****************************************************************************/
extern void dummyfunc(void);
extern const struct struct_s *getstruct(void);
-#endif /* __EXAMPLES_NXFLAT_TESTS_STRUCT_STRUCT_H */
+#endif /* __APPS_EXAMPLES_NXFLAT_TESTS_STRUCT_STRUCT_H */
diff --git a/examples/nxterm/nxterm_internal.h b/examples/nxterm/nxterm_internal.h
index 9637e7e..963de88 100644
--- a/examples/nxterm/nxterm_internal.h
+++ b/examples/nxterm/nxterm_internal.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __EXAMPLES_NXTERM_NXTERM_INTERNAL_H
-#define __EXAMPLES_NXTERM_NXTERM_INTERNAL_H
+#ifndef __APPS_EXAMPLES_NXTERM_NXTERM_INTERNAL_H
+#define __APPS_EXAMPLES_NXTERM_NXTERM_INTERNAL_H
/****************************************************************************
* Included Files
@@ -41,7 +41,9 @@
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
+
/* Configuration ************************************************************/
+
/* Need NX graphics support */
#ifndef CONFIG_NX
@@ -252,4 +254,4 @@ extern const struct nx_callback_s g_nxtoolcb;
FAR void *nxterm_listener(FAR void *arg);
-#endif /* __EXAMPLES_NXTERM_NXTERM_INTERNAL_H */
+#endif /* __APPS_EXAMPLES_NXTERM_NXTERM_INTERNAL_H */
diff --git a/examples/nxtext/nxtext_internal.h b/examples/nxtext/nxtext_internal.h
index 0d0b07f..8884411 100644
--- a/examples/nxtext/nxtext_internal.h
+++ b/examples/nxtext/nxtext_internal.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __EXAMPLES_NXTEXT_NXTEXT_INTERNAL_H
-#define __EXAMPLES_NXTEXT_NXTEXT_INTERNAL_H
+#ifndef __APPS_EXAMPLES_NXTEXT_NXTEXT_INTERNAL_H
+#define __APPS_EXAMPLES_NXTEXT_NXTEXT_INTERNAL_H
/****************************************************************************
* Included Files
@@ -315,4 +315,4 @@ void nxtext_fillchar(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect,
FAR struct nxtext_state_s *st, NXHANDLE hfont,
FAR const struct nxtext_bitmap_s *bm);
-#endif /* __EXAMPLES_NXTEXT_NXTEXT_INTERNAL_H */
+#endif /* __APPS_EXAMPLES_NXTEXT_NXTEXT_INTERNAL_H */
diff --git a/examples/pf_ieee802154/pfieee802154.h b/examples/pf_ieee802154/pfieee802154.h
index 3668d09..86baf2c 100644
--- a/examples/pf_ieee802154/pfieee802154.h
+++ b/examples/pf_ieee802154/pfieee802154.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __EXAMPLES_PFIEEE802154_PFIEEE802154_H
-#define __EXAMPLES_PFIEEE802154_PFIEEE802154_H
+#ifndef __APPS_EXAMPLES_PFIEEE802154_PFIEEE802154_H
+#define __APPS_EXAMPLES_PFIEEE802154_PFIEEE802154_H
/****************************************************************************
* Included Files
@@ -49,4 +49,4 @@ void pf_cmdline(int argc, char **argv);
void pf_client(void);
void pf_server(void);
-#endif /* __EXAMPLES_PFIEEE802154_IEEE802154_H */
+#endif /* __APPS_EXAMPLES_PFIEEE802154_IEEE802154_H */
diff --git a/examples/pipe/pipe.h b/examples/pipe/pipe.h
index 277ed67..6ce7c06 100644
--- a/examples/pipe/pipe.h
+++ b/examples/pipe/pipe.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __EXAMPLES_PIPE_PIPE_H
-#define __EXAMPLES_PIPE_PIPE_H
+#ifndef __APPS_EXAMPLES_PIPE_PIPE_H
+#define __APPS_EXAMPLES_PIPE_PIPE_H
/****************************************************************************
* Compilation Switches
@@ -52,4 +52,4 @@ extern int transfer_test(int fdin, int fdout);
extern int interlock_test(void);
extern int redirection_test(void);
-#endif /* __EXAMPLES_PIPE_PIPE_H */
+#endif /* __APPS_EXAMPLES_PIPE_PIPE_H */
diff --git a/examples/poll/poll_internal.h b/examples/poll/poll_internal.h
index 59bfc8c..7257952 100644
--- a/examples/poll/poll_internal.h
+++ b/examples/poll/poll_internal.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __EXAMPLES_POLL_POLL_INTERNAL_H
-#define __EXAMPLES_POLL_POLL_INTERNAL_H
+#ifndef __APPS_EXAMPLES_POLL_POLL_INTERNAL_H
+#define __APPS_EXAMPLES_POLL_POLL_INTERNAL_H
/****************************************************************************
* Compilation Switches
@@ -78,4 +78,4 @@ extern void *select_listener(pthread_addr_t pvarg);
extern void *net_listener(pthread_addr_t pvarg);
extern void *net_reader(pthread_addr_t pvarg);
#endif
-#endif /* __EXAMPLES_POLL_POLL_INTERNAL_H */
+#endif /* __APPS_EXAMPLES_POLL_POLL_INTERNAL_H */
diff --git a/examples/pwfb/pwfb_internal.h b/examples/pwfb/pwfb_internal.h
index 43b5a80..3890d7a 100644
--- a/examples/pwfb/pwfb_internal.h
+++ b/examples/pwfb/pwfb_internal.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __EXAMPLES_PWFB_PWFB_INTERNAL_H
-#define __EXAMPLES_PWFB_PWFB_INTERNAL_H
+#ifndef __APPS_EXAMPLES_PWFB_PWFB_INTERNAL_H
+#define __APPS_EXAMPLES_PWFB_PWFB_INTERNAL_H
/****************************************************************************
* Included Files
@@ -263,4 +263,4 @@ extern const struct nx_callback_s g_pwfb_tbcb;
FAR void *pwfb_listener(FAR void *arg);
bool pwfb_motion(FAR struct pwfb_state_s *st);
-#endif /* __EXAMPLES_PWFB_PWFB_INTERNAL_H */
+#endif /* __APPS_EXAMPLES_PWFB_PWFB_INTERNAL_H */
diff --git a/examples/pwlines/pwlines_internal.h b/examples/pwlines/pwlines_internal.h
index 023331e..2d6fefa 100644
--- a/examples/pwlines/pwlines_internal.h
+++ b/examples/pwlines/pwlines_internal.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __EXAMPLES_PWLINES_PWLINES_INTERNAL_H
-#define __EXAMPLES_PWLINES_PWLINES_INTERNAL_H
+#ifndef __APPS_EXAMPLES_PWLINES_PWLINES_INTERNAL_H
+#define __APPS_EXAMPLES_PWLINES_PWLINES_INTERNAL_H
/****************************************************************************
* Included Files
@@ -228,4 +228,4 @@ void pwlines_circle(FAR struct pwlines_state_s *st);
void pwlines_update(FAR struct pwlines_state_s *st);
bool pwlines_motion(FAR struct pwlines_state_s *st);
-#endif /* __EXAMPLES_PWLINES_PWLINES_INTERNAL_H */
+#endif /* __APPS_EXAMPLES_PWLINES_PWLINES_INTERNAL_H */
diff --git a/examples/tcpblaster/tcpblaster.h b/examples/tcpblaster/tcpblaster.h
index c59aed8..421f87e 100644
--- a/examples/tcpblaster/tcpblaster.h
+++ b/examples/tcpblaster/tcpblaster.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __APPS_EXAMPLES_TCPBLASTER_H
-#define __APPS_EXAMPLES_TCPBLASTER_H
+#ifndef __APPS_EXAMPLES_TCPBLASTER_TCPBLASTER_H
+#define __APPS_EXAMPLES_TCPBLASTER_TCPBLASTER_H
/****************************************************************************
* Included Files
@@ -108,4 +108,4 @@ void tcpblaster_cmdline(int argc, char **argv);
extern void tcpblaster_client(void);
extern void tcpblaster_server(void);
-#endif /* __APPS_EXAMPLES_TCPBLASTER_H */
+#endif /* __APPS_EXAMPLES_TCPBLASTER_TCPBLASTER_H */
diff --git a/examples/udgram/udgram.h b/examples/udgram/udgram.h
index 396a897..84c5adf 100644
--- a/examples/udgram/udgram.h
+++ b/examples/udgram/udgram.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __EXAMPLES_UDGRAM_UDGRAM_H
-#define __EXAMPLES_UDGRAM_UDGRAM_H
+#ifndef __APPS_EXAMPLES_UDGRAM_UDGRAM_H
+#define __APPS_EXAMPLES_UDGRAM_UDGRAM_H
/****************************************************************************
* Included Files
@@ -36,4 +36,4 @@
* Public Function Prototypes
****************************************************************************/
-#endif /* __EXAMPLES_UDGRAM_UDGRAM_H */
+#endif /* __APPS_EXAMPLES_UDGRAM_UDGRAM_H */
diff --git a/examples/udp/udp.h b/examples/udp/udp.h
index d80dff1..35f0f82 100644
--- a/examples/udp/udp.h
+++ b/examples/udp/udp.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __EXAMPLES_UDP_UDP_H
-#define __EXAMPLES_UDP_UDP_H
+#ifndef __APPS_EXAMPLES_UDP_UDP_H
+#define __APPS_EXAMPLES_UDP_UDP_H
/****************************************************************************
* Included Files
@@ -93,4 +93,4 @@ void udp_cmdline(int argc, char **argv);
void udp_client(void);
void udp_server(void);
-#endif /* __EXAMPLES_UDP_UDP_H */
+#endif /* __APPS_EXAMPLES_UDP_UDP_H */
diff --git a/examples/udpblaster/udpblaster.h b/examples/udpblaster/udpblaster.h
index 772abfe..1c4fb0f 100644
--- a/examples/udpblaster/udpblaster.h
+++ b/examples/udpblaster/udpblaster.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __EXAMPLES_UDPBLASTER_UDPBLASTER_H
-#define __EXAMPLES_UDPBLASTER_UDPBLASTER_H
+#ifndef __APPS_EXAMPLES_UDPBLASTER_UDPBLASTER_H
+#define __APPS_EXAMPLES_UDPBLASTER_UDPBLASTER_H
/****************************************************************************
* Included Files
@@ -119,4 +119,4 @@ extern const int g_udpblaster_strlen;
* Public Function Prototypes
****************************************************************************/
-#endif /* __EXAMPLES_UDPBLASTER_UDPBLASTER_H */
+#endif /* __APPS_EXAMPLES_UDPBLASTER_UDPBLASTER_H */
diff --git a/examples/usrsocktest/defines.h b/examples/usrsocktest/defines.h
index cc40571..d2be13e 100644
--- a/examples/usrsocktest/defines.h
+++ b/examples/usrsocktest/defines.h
@@ -35,8 +35,8 @@
*
****************************************************************************/
-#ifndef __EXAMPLES_USRSOCKTEST_DEFINES_H
-#define __EXAMPLES_USRSOCKTEST_DEFINES_H
+#ifndef __APPS_EXAMPLES_USRSOCKTEST_DEFINES_H
+#define __APPS_EXAMPLES_USRSOCKTEST_DEFINES_H
/****************************************************************************
* Included Files
@@ -209,4 +209,4 @@ bool usrsocktest_send_delayed_command(char cmd, unsigned int delay_msec);
int usrsocktest_daemon_pause_usrsock_handling(bool pause);
-#endif /* __EXAMPLES_USRSOCKTEST_DEFINES_H */
+#endif /* __APPS_EXAMPLES_USRSOCKTEST_DEFINES_H */
diff --git a/examples/ustream/ustream.h b/examples/ustream/ustream.h
index 28f996f..f74bf48 100644
--- a/examples/ustream/ustream.h
+++ b/examples/ustream/ustream.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __APPS_EXAMPLES_USTREAM_H
-#define __APPS_EXAMPLES_USTREAM_H
+#ifndef __APPS_EXAMPLES_USTREAM_USTREAM_H
+#define __APPS_EXAMPLES_USTREAM_USTREAM_H
/****************************************************************************
* Included Files
@@ -35,4 +35,4 @@
* Public Function Prototypes
****************************************************************************/
-#endif /* __APPS_EXAMPLES_USTREAM_H */
+#endif /* __APPS_EXAMPLES_USTREAM_USTREAM_H */
diff --git a/examples/watched/watched.h b/examples/watched/watched.h
index 8f2150c..c49907b 100644
--- a/examples/watched/watched.h
+++ b/examples/watched/watched.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __EXAMPLES_WATCHER_WATCHED_H
-#define __EXAMPLES_WATCHER_WATCHED_H
+#ifndef __APPS_EXAMPLES_WATCHER_WATCHED_H
+#define __APPS_EXAMPLES_WATCHER_WATCHED_H
/****************************************************************************
* Included Files
@@ -76,4 +76,4 @@ int watched_subscribe(struct watched_info_s *info);
int watched_unsubscribe(struct watched_info_s *info);
int watched_feed_dog(struct watched_info_s *info);
-#endif /* __EXAMPLES_WATCHER_WATCHED_H */
+#endif /* __APPS_EXAMPLES_WATCHER_WATCHED_H */
diff --git a/examples/watcher/ramdisk.h b/examples/watcher/ramdisk.h
index ae7448e..bf10ba6 100644
--- a/examples/watcher/ramdisk.h
+++ b/examples/watcher/ramdisk.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __EXAMPLES_WATCHER_RAMDISK_H
-#define __EXAMPLES_WATCHER_RAMDISK_H
+#ifndef __APPS_EXAMPLES_WATCHER_RAMDISK_H
+#define __APPS_EXAMPLES_WATCHER_RAMDISK_H
/****************************************************************************
* Included Files
@@ -53,4 +53,4 @@
int create_ramdisk(void);
int prepare_fs(void);
-#endif /* __EXAMPLES_WATCHER_RAMDISK_H */
+#endif /* __APPS_EXAMPLES_WATCHER_RAMDISK_H */
diff --git a/examples/watcher/task_mn.h b/examples/watcher/task_mn.h
index 4b8c0ca..d20b095 100644
--- a/examples/watcher/task_mn.h
+++ b/examples/watcher/task_mn.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __EXAMPLES_WATCHER_TASK_MN_H
-#define __EXAMPLES_WATCHER_TASK_MN_H
+#ifndef __APPS_EXAMPLES_WATCHER_TASK_MN_H
+#define __APPS_EXAMPLES_WATCHER_TASK_MN_H
/****************************************************************************
* Included Files
@@ -76,4 +76,4 @@ void task_mn_subscribe(pid_t id);
void task_mn_unsubscribe(pid_t id);
bool task_mn_all_tasks_fed(void);
-#endif /* __EXAMPLES_WATCHER_TASK_MN_H */
+#endif /* __APPS_EXAMPLES_WATCHER_TASK_MN_H */
diff --git a/examples/watcher/wdt.h b/examples/watcher/wdt.h
index 7bdef17..2d20395 100644
--- a/examples/watcher/wdt.h
+++ b/examples/watcher/wdt.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __EXAMPLES_WATCHER_WDT_H
-#define __EXAMPLES_WATCHER_WDT_H
+#ifndef __APPS_EXAMPLES_WATCHER_WDT_H
+#define __APPS_EXAMPLES_WATCHER_WDT_H
/****************************************************************************
* Included Files
@@ -56,4 +56,4 @@ struct wdog_params_s
int wdt_init(void);
void wdt_feed_the_dog(void);
-#endif /* __EXAMPLES_WATCHER_WDT_H */
+#endif /* __APPS_EXAMPLES_WATCHER_WDT_H */
diff --git a/examples/webserver/cgi.h b/examples/webserver/cgi.h
index a71d306..1f0dae9 100644
--- a/examples/webserver/cgi.h
+++ b/examples/webserver/cgi.h
@@ -31,8 +31,8 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
****************************************************************************/
-#ifndef __EXAMPLES_WEBSERVER_CGI_H
-#define __EXAMPLES_WEBSERVER_CGI_H
+#ifndef __APPS_EXAMPLES_WEBSERVER_CGI_H
+#define __APPS_EXAMPLES_WEBSERVER_CGI_H
/****************************************************************************
* Public Function Prototypes
@@ -40,4 +40,4 @@
void cgi_register(void);
-#endif /* __EXAMPLES_WEBSERVER_CGI_H */
+#endif /* __APPS_EXAMPLES_WEBSERVER_CGI_H */
diff --git a/graphics/lvgl/lv_fs_interface.h b/graphics/lvgl/lv_fs_interface.h
index f5bed04..a02558e 100644
--- a/graphics/lvgl/lv_fs_interface.h
+++ b/graphics/lvgl/lv_fs_interface.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __LV_FS_INTERFACE_H__
-#define __LV_FS_INTERFACE_H__
+#ifndef __APPS_GRAPHICS_LVGL_LV_FS_INTERFACE_H
+#define __APPS_GRAPHICS_LVGL_LV_FS_INTERFACE_H
/****************************************************************************
* Included Files
@@ -63,4 +63,4 @@ void lv_fs_interface_init(void);
#endif /* LV_USE_FILESYSTEM */
-#endif /* __LV_FS_INTERFACE_H__ */
+#endif /* __APPS_GRAPHICS_LVGL_LV_FS_INTERFACE_H */
diff --git a/graphics/lvgl/lv_tick_interface.h b/graphics/lvgl/lv_tick_interface.h
index 30e4873..2a95465 100644
--- a/graphics/lvgl/lv_tick_interface.h
+++ b/graphics/lvgl/lv_tick_interface.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __LV_TICK_INTERFACE_H__
-#define __LV_TICK_INTERFACE_H__
+#ifndef __APPS_GRAPHICS_LV_TICK_INTERFACE_H
+#define __APPS_GRAPHICS_LV_TICK_INTERFACE_H
/****************************************************************************
* Included Files
@@ -59,4 +59,4 @@ uint32_t lv_tick_interface(void);
}
#endif
-#endif // __LV_TICK_INTERFACE_H__
+#endif // __APPS_GRAPHICS_LV_TICK_INTERFACE_H
diff --git a/graphics/nxwidgets/UnitTests/CButton/cbuttontest.hxx b/graphics/nxwidgets/UnitTests/CButton/cbuttontest.hxx
index 46d4da1..bbe0c25 100644
--- a/graphics/nxwidgets/UnitTests/CButton/cbuttontest.hxx
+++ b/graphics/nxwidgets/UnitTests/CButton/cbuttontest.hxx
@@ -33,8 +33,8 @@
//
//////////////////////////////////////////////////////////////////////////////
-#ifndef __UNITTESTS_CBUTTON_CBUTTONTEST_HXX
-#define __UNITTESTS_CBUTTON_CBUTTONTEST_HXX
+#ifndef __APPS_GRAPHICS_NXWIDGETS_UNITTESTS_CBUTTON_CBUTTONTEST_HXX
+#define __APPS_GRAPHICS_NXWIDGETS_UNITTESTS_CBUTTON_CBUTTONTEST_HXX
/////////////////////////////////////////////////////////////////////////////
// Included Files
@@ -154,4 +154,4 @@ public:
/////////////////////////////////////////////////////////////////////////////
-#endif // __UNITTESTS_CBUTTON_CBUTTONTEST_HXX
+#endif // __APPS_GRAPHICS_NXWIDGETS_UNITTESTS_CBUTTON_CBUTTONTEST_HXX
diff --git a/graphics/nxwidgets/UnitTests/CButtonArray/cbuttonarraytest.hxx b/graphics/nxwidgets/UnitTests/CButtonArray/cbuttonarraytest.hxx
index 50c297e..0dd1012 100644
--- a/graphics/nxwidgets/UnitTests/CButtonArray/cbuttonarraytest.hxx
+++ b/graphics/nxwidgets/UnitTests/CButtonArray/cbuttonarraytest.hxx
@@ -33,8 +33,8 @@
//
//////////////////////////////////////////////////////////////////////////////
-#ifndef __UNITTESTS_CBUTTONARRAY_CBUTTONARRAYTEST_HXX
-#define __UNITTESTS_CBUTTONARRAY_CBUTTONARRAYTEST_HXX
+#ifndef __APPS_GRAPHICS_NXWIDGETS_UNITTESTS_CBUTTONARRAY_CBUTTONARRAYTEST_HXX
+#define __APPS_GRAPHICS_NXWIDGETS_UNITTESTS_CBUTTONARRAY_CBUTTONARRAYTEST_HXX
/////////////////////////////////////////////////////////////////////////////
// Included Files
@@ -160,4 +160,4 @@ public:
/////////////////////////////////////////////////////////////////////////////
-#endif // __UNITTESTS_CBUTTONARRAY_CBUTTONARRAYTEST_HXX
+#endif // __APPS_GRAPHICS_NXWIDGETS_UNITTESTS_CBUTTONARRAY_CBUTTONARRAYTEST_HXX
diff --git a/graphics/nxwidgets/UnitTests/CCheckBox/ccheckboxtest.hxx b/graphics/nxwidgets/UnitTests/CCheckBox/ccheckboxtest.hxx
index 4cec99e..e19ee66 100644
--- a/graphics/nxwidgets/UnitTests/CCheckBox/ccheckboxtest.hxx
+++ b/graphics/nxwidgets/UnitTests/CCheckBox/ccheckboxtest.hxx
@@ -33,8 +33,8 @@
//
//////////////////////////////////////////////////////////////////////////////
-#ifndef __UNITTESTS_CCHECKBOX_CCHECKBOXTEST_HXX
-#define __UNITTESTS_CCHECKBOX_CCHECKBOXTEST_HXX
+#ifndef __APPS_GRAPHICS_NXWIDGETS_UNITTESTS_CCHECKBOX_CCHECKBOXTEST_HXX
+#define __APPS_GRAPHICS_NXWIDGETS_UNITTESTS_CCHECKBOX_CCHECKBOXTEST_HXX
/////////////////////////////////////////////////////////////////////////////
// Included Files
@@ -130,4 +130,4 @@ public:
// Public Function Prototypes
/////////////////////////////////////////////////////////////////////////////
-#endif // __UNITTESTS_CCHECKBOX_CCHECKBOXTEST_HXX
+#endif // __APPS_GRAPHICS_NXWIDGETS_UNITTESTS_CCHECKBOX_CCHECKBOXTEST_HXX
diff --git a/graphics/nxwidgets/UnitTests/CGlyphButton/cglyphbuttontest.hxx b/graphics/nxwidgets/UnitTests/CGlyphButton/cglyphbuttontest.hxx
index bc3f4b3..864fe30 100644
--- a/graphics/nxwidgets/UnitTests/CGlyphButton/cglyphbuttontest.hxx
+++ b/graphics/nxwidgets/UnitTests/CGlyphButton/cglyphbuttontest.hxx
@@ -33,8 +33,8 @@
//
//////////////////////////////////////////////////////////////////////////////
-#ifndef __UNITTESTS_CGLYPHBUTTON_CGLYPHBUTTONTEST_HXX
-#define __UNITTESTS_CGLYPHBUTTON_CGLYPHBUTTONTEST_HXX
+#ifndef __APPS_GRAPHICS_NXWIDGETS_UNITTESTS_CGLYPHBUTTON_CGLYPHBUTTONTEST_HXX
+#define __APPS_GRAPHICS_NXWIDGETS_UNITTESTS_CGLYPHBUTTON_CGLYPHBUTTONTEST_HXX
/////////////////////////////////////////////////////////////////////////////
// Included Files
@@ -160,4 +160,4 @@ public:
/////////////////////////////////////////////////////////////////////////////
-#endif // __UNITTESTS_CGLYPHBUTTON_CGLYPHBUTTONTEST_HXX
+#endif // __APPS_GRAPHICS_NXWIDGETS_UNITTESTS_CGLYPHBUTTON_CGLYPHBUTTONTEST_HXX
diff --git a/graphics/nxwidgets/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontaltest.hxx b/graphics/nxwidgets/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontaltest.hxx
index 0d6a3a9..2138d10 100644
--- a/graphics/nxwidgets/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontaltest.hxx
+++ b/graphics/nxwidgets/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontaltest.hxx
@@ -33,8 +33,8 @@
//
//////////////////////////////////////////////////////////////////////////////
-#ifndef __UNITTESTS_CGLYPHSLIDERHORIZONTAL_CGLYPHSLIDERHORIZONTALTEST_HXX
-#define __UNITTESTS_CGLYPHSLIDERHORIZONTAL_CGLYPHSLIDERHORIZONTALTEST_HXX
+#ifndef __APPS_GRAPHICS_NXWIDGETS_UNITTESTS_CGLYPHSLIDERHORIZONTAL_CGLYPHSLIDERHORIZONTALTEST_HXX
+#define __APPS_GRAPHICS_NXWIDGETS_UNITTESTS_CGLYPHSLIDERHORIZONTAL_CGLYPHSLIDERHORIZONTALTEST_HXX
/////////////////////////////////////////////////////////////////////////////
// Included Files
@@ -125,4 +125,4 @@ public:
// Public Function Prototypes
/////////////////////////////////////////////////////////////////////////////
-#endif // __UNITTESTS_CGLYPHSLIDERHORIZONTAL_CGLYPHSLIDERHORIZONTALTEST_HXX
+#endif // __APPS_GRAPHICS_NXWIDGETS_UNITTESTS_CGLYPHSLIDERHORIZONTAL_CGLYPHSLIDERHORIZONTALTEST_HXX
diff --git a/graphics/nxwidgets/UnitTests/CImage/cimagetest.hxx b/graphics/nxwidgets/UnitTests/CImage/cimagetest.hxx
index eca34f8..ec69c5e 100644
--- a/graphics/nxwidgets/UnitTests/CImage/cimagetest.hxx
+++ b/graphics/nxwidgets/UnitTests/CImage/cimagetest.hxx
@@ -33,8 +33,8 @@
//
//////////////////////////////////////////////////////////////////////////////
-#ifndef __UNITTESTS_CIMAGE_CIMAGETEST_HXX
-#define __UNITTESTS_CIMAGE_CIMAGETEST_HXX
+#ifndef __APPS_GRAPHICS_NXWIDGETS_UNITTESTS_CIMAGE_CIMAGETEST_HXX
+#define __APPS_GRAPHICS_NXWIDGETS_UNITTESTS_CIMAGE_CIMAGETEST_HXX
/////////////////////////////////////////////////////////////////////////////
// Included Files
@@ -128,4 +128,4 @@ public:
// Public Function Prototypes
/////////////////////////////////////////////////////////////////////////////
-#endif // __UNITTESTS_CIMAGE_CIMAGETEST_HXX
+#endif // __APPS_GRAPHICS_NXWIDGETS_UNITTESTS_CIMAGE_CIMAGETEST_HXX
diff --git a/graphics/nxwidgets/UnitTests/CKeypad/ckeypadtest.hxx b/graphics/nxwidgets/UnitTests/CKeypad/ckeypadtest.hxx
index 15c9a73..131489a 100644
--- a/graphics/nxwidgets/UnitTests/CKeypad/ckeypadtest.hxx
+++ b/graphics/nxwidgets/UnitTests/CKeypad/ckeypadtest.hxx
@@ -33,8 +33,8 @@
//
//////////////////////////////////////////////////////////////////////////////
-#ifndef __UNITTESTS_CKEYPAD_CKEYPADTEST_HXX
-#define __UNITTESTS_CKEYPAD_CKEYPADTEST_HXX
+#ifndef __APPS_GRAPHICS_NXWIDGETS_UNITTESTS_CKEYPAD_CKEYPADTEST_HXX
+#define __APPS_GRAPHICS_NXWIDGETS_UNITTESTS_CKEYPAD_CKEYPADTEST_HXX
/////////////////////////////////////////////////////////////////////////////
// Included Files
@@ -170,4 +170,4 @@ public:
// Public Function Prototypes
/////////////////////////////////////////////////////////////////////////////
-#endif // __UNITTESTS_CKEYPAD_CKEYPADTEST_HXX
+#endif // __APPS_GRAPHICS_NXWIDGETS_UNITTESTS_CKEYPAD_CKEYPADTEST_HXX
diff --git a/graphics/nxwidgets/UnitTests/CLabel/clabeltest.hxx b/graphics/nxwidgets/UnitTests/CLabel/clabeltest.hxx
index 22f5264..56e8f6c 100644
--- a/graphics/nxwidgets/UnitTests/CLabel/clabeltest.hxx
+++ b/graphics/nxwidgets/UnitTests/CLabel/clabeltest.hxx
@@ -33,8 +33,8 @@
//
//////////////////////////////////////////////////////////////////////////////
-#ifndef __UNITTESTS_CLABEL_CLABELTEST_HXX
-#define __UNITTESTS_CLABEL_CLABELTEST_HXX
+#ifndef __APPS_GRAPHICS_NXWIDGETS_UNITTESTS_CLABEL_CLABELTEST_HXX
+#define __APPS_GRAPHICS_NXWIDGETS_UNITTESTS_CLABEL_CLABELTEST_HXX
/////////////////////////////////////////////////////////////////////////////
// Included Files
@@ -135,4 +135,4 @@ public:
/////////////////////////////////////////////////////////////////////////////
-#endif // __UNITTESTS_CLABEL_CLABELTEST_HXX
+#endif // __APPS_GRAPHICS_NXWIDGETS_UNITTESTS_CLABEL_CLABELTEST_HXX
diff --git a/graphics/nxwidgets/UnitTests/CLatchButton/clatchbuttontest.hxx b/graphics/nxwidgets/UnitTests/CLatchButton/clatchbuttontest.hxx
index 79a7530..0670e96 100644
--- a/graphics/nxwidgets/UnitTests/CLatchButton/clatchbuttontest.hxx
+++ b/graphics/nxwidgets/UnitTests/CLatchButton/clatchbuttontest.hxx
@@ -33,8 +33,8 @@
//
//////////////////////////////////////////////////////////////////////////////
-#ifndef __UNITTESTS_CLATCHBUTTON_CLATCHBUTTONTEST_HXX
-#define __UNITTESTS_CLATCHBUTTON_CLATCHBUTTONTEST_HXX
+#ifndef __APPS_GRAPHICS_NXWIDGETS_UNITTESTS_CLATCHBUTTON_CLATCHBUTTONTEST_HXX
+#define __APPS_GRAPHICS_NXWIDGETS_UNITTESTS_CLATCHBUTTON_CLATCHBUTTONTEST_HXX
/////////////////////////////////////////////////////////////////////////////
// Included Files
@@ -152,4 +152,4 @@ public:
// Public Function Prototypes
/////////////////////////////////////////////////////////////////////////////
-#endif // __UNITTESTS_CLATCHBUTTON_CLATCHBUTTONTEST_HXX
+#endif // __APPS_GRAPHICS_NXWIDGETS_UNITTESTS_CLATCHBUTTON_CLATCHBUTTONTEST_HXX
diff --git a/graphics/nxwidgets/UnitTests/CLatchButtonArray/clatchbuttonarraytest.hxx b/graphics/nxwidgets/UnitTests/CLatchButtonArray/clatchbuttonarraytest.hxx
index 837609f..3202118 100644
--- a/graphics/nxwidgets/UnitTests/CLatchButtonArray/clatchbuttonarraytest.hxx
+++ b/graphics/nxwidgets/UnitTests/CLatchButtonArray/clatchbuttonarraytest.hxx
@@ -33,8 +33,8 @@
//
//////////////////////////////////////////////////////////////////////////////
-#ifndef __UNITTESTS_CLATCHBUTTONARRAY_CLATCHBUTTONARRAYTEST_HXX
-#define __UNITTESTS_CLATCHBUTTONARRAY_CLATCHBUTTONARRAYTEST_HXX
+#ifndef __APPS_GRAPHICS_NXWIDGETS_UNITTESTS_CLATCHBUTTONARRAY_CLATCHBUTTONARRAYTEST_HXX
+#define __APPS_GRAPHICS_NXWIDGETS_UNITTESTS_CLATCHBUTTONARRAY_CLATCHBUTTONARRAYTEST_HXX
/////////////////////////////////////////////////////////////////////////////
// Included Files
@@ -160,4 +160,4 @@ public:
/////////////////////////////////////////////////////////////////////////////
-#endif // __UNITTESTS_CLATCHBUTTONARRAY_CLATCHBUTTONARRAYTEST_HXX
+#endif // __APPS_GRAPHICS_NXWIDGETS_UNITTESTS_CLATCHBUTTONARRAY_CLATCHBUTTONARRAYTEST_HXX
diff --git a/graphics/nxwidgets/UnitTests/CListBox/clistboxtest.hxx b/graphics/nxwidgets/UnitTests/CListBox/clistboxtest.hxx
index ef742ee..4323e0f 100644
--- a/graphics/nxwidgets/UnitTests/CListBox/clistboxtest.hxx
+++ b/graphics/nxwidgets/UnitTests/CListBox/clistboxtest.hxx
@@ -33,8 +33,8 @@
//
//////////////////////////////////////////////////////////////////////////////
-#ifndef __UNITTESTS_CLISTBOX_CLISTBOXTEST_HXX
-#define __UNITTESTS_CLISTBOX_CLISTBOXTEST_HXX
+#ifndef __APPS_GRAPHICS_NXWIDGETS_UNITTESTS_CLISTBOX_CLISTBOXTEST_HXX
+#define __APPS_GRAPHICS_NXWIDGETS_UNITTESTS_CLISTBOX_CLISTBOXTEST_HXX
/////////////////////////////////////////////////////////////////////////////
// Included Files
@@ -125,4 +125,4 @@ public:
// Public Function Prototypes
/////////////////////////////////////////////////////////////////////////////
-#endif // __UNITTESTS_CLISTBOX_CLISTBOXTEST_HXX
+#endif // __APPS_GRAPHICS_NXWIDGETS_UNITTESTS_CLISTBOX_CLISTBOXTEST_HXX
diff --git a/graphics/nxwidgets/UnitTests/CProgressBar/cprogressbartest.hxx b/graphics/nxwidgets/UnitTests/CProgressBar/cprogressbartest.hxx
index b6e4125..363b88f 100644
--- a/graphics/nxwidgets/UnitTests/CProgressBar/cprogressbartest.hxx
+++ b/graphics/nxwidgets/UnitTests/CProgressBar/cprogressbartest.hxx
@@ -33,8 +33,8 @@
//
//////////////////////////////////////////////////////////////////////////////
-#ifndef __UNITTESTS_CPROGRESSBAR_CPROGRESSBARTEST_HXX
-#define __UNITTESTS_CPROGRESSBAR_CPROGRESSBARTEST_HXX
+#ifndef __APPS_GRAPHICS_NXWIDGETS_UNITTESTS_CPROGRESSBAR_CPROGRESSBARTEST_HXX
+#define __APPS_GRAPHICS_NXWIDGETS_UNITTESTS_CPROGRESSBAR_CPROGRESSBARTEST_HXX
/////////////////////////////////////////////////////////////////////////////
// Included Files
@@ -125,4 +125,4 @@ public:
// Public Function Prototypes
/////////////////////////////////////////////////////////////////////////////
-#endif // __UNITTESTS_CPROGRESSBAR_CPROGRESSBARTEST_HXX
+#endif // __APPS_GRAPHICS_NXWIDGETS_UNITTESTS_CPROGRESSBAR_CPROGRESSBARTEST_HXX
diff --git a/graphics/nxwidgets/UnitTests/CRadioButton/cradiobuttontest.hxx b/graphics/nxwidgets/UnitTests/CRadioButton/cradiobuttontest.hxx
index 90f8939..a9c36e8 100644
--- a/graphics/nxwidgets/UnitTests/CRadioButton/cradiobuttontest.hxx
+++ b/graphics/nxwidgets/UnitTests/CRadioButton/cradiobuttontest.hxx
@@ -33,8 +33,8 @@
//
//////////////////////////////////////////////////////////////////////////////
-#ifndef __UNITTESTS_CRADIOBUTTON_CRADIOBUTTONTEST_HXX
-#define __UNITTESTS_CRADIOBUTTON_CRADIOBUTTONTEST_HXX
+#ifndef __APPS_GRAPHICS_NXWIDGETS_UNITTESTS_CRADIOBUTTON_CRADIOBUTTONTEST_HXX
+#define __APPS_GRAPHICS_NXWIDGETS_UNITTESTS_CRADIOBUTTON_CRADIOBUTTONTEST_HXX
/////////////////////////////////////////////////////////////////////////////
// Included Files
@@ -140,4 +140,4 @@ public:
// Public Function Prototypes
/////////////////////////////////////////////////////////////////////////////
-#endif // __UNITTESTS_CRADIOBUTTON_CRADIOBUTTONTEST_HXX
+#endif // __APPS_GRAPHICS_NXWIDGETS_UNITTESTS_CRADIOBUTTON_CRADIOBUTTONTEST_HXX
diff --git a/graphics/nxwidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontaltest.hxx b/graphics/nxwidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontaltest.hxx
index 1a30b85..2fcda97 100644
--- a/graphics/nxwidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontaltest.hxx
+++ b/graphics/nxwidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontaltest.hxx
@@ -33,8 +33,8 @@
//
//////////////////////////////////////////////////////////////////////////////
-#ifndef __UNITTESTS_CSCROLLBARHORIZONTAL_CSCROLLBARHORIZONTALTEST_HXX
-#define __UNITTESTS_CSCROLLBARHORIZONTAL_CSCROLLBARHORIZONTALTEST_HXX
+#ifndef __APPS_GRAPHICS_NXWIDGETS_UNITTESTS_CSCROLLBARHORIZONTAL_CSCROLLBARHORIZONTALTEST_HXX
+#define __APPS_GRAPHICS_NXWIDGETS_UNITTESTS_CSCROLLBARHORIZONTAL_CSCROLLBARHORIZONTALTEST_HXX
/////////////////////////////////////////////////////////////////////////////
// Included Files
@@ -125,4 +125,4 @@ public:
// Public Function Prototypes
/////////////////////////////////////////////////////////////////////////////
-#endif // __UNITTESTS_CSCROLLBARHORIZONTAL_CSCROLLBARHORIZONTALTEST_HXX
+#endif // __APPS_GRAPHICS_NXWIDGETS_UNITTESTS_CSCROLLBARHORIZONTAL_CSCROLLBARHORIZONTALTEST_HXX
diff --git a/graphics/nxwidgets/UnitTests/CScrollbarVertical/cscrollbarverticaltest.hxx b/graphics/nxwidgets/UnitTests/CScrollbarVertical/cscrollbarverticaltest.hxx
index 916d3b9..353ab52 100644
--- a/graphics/nxwidgets/UnitTests/CScrollbarVertical/cscrollbarverticaltest.hxx
+++ b/graphics/nxwidgets/UnitTests/CScrollbarVertical/cscrollbarverticaltest.hxx
@@ -33,8 +33,8 @@
//
//////////////////////////////////////////////////////////////////////////////
-#ifndef __UNITTESTS_CSCROLLBARVERTICAL_CSCROLLBARVERTICALTEST_HXX
-#define __UNITTESTS_CSCROLLBARVERTICAL_CSCROLLBARVERTICALTEST_HXX
+#ifndef __APPS_GRAPHICS_NXWIDGETS_UNITTESTS_CSCROLLBARVERTICAL_CSCROLLBARVERTICALTEST_HXX
+#define __APPS_GRAPHICS_NXWIDGETS_UNITTESTS_CSCROLLBARVERTICAL_CSCROLLBARVERTICALTEST_HXX
/////////////////////////////////////////////////////////////////////////////
// Included Files
@@ -125,4 +125,4 @@ public:
// Public Function Prototypes
/////////////////////////////////////////////////////////////////////////////
-#endif // __UNITTESTS_CSCROLLBARVERTICAL_CSCROLLBARVERTICALTEST_HXX
+#endif // __APPS_GRAPHICS_NXWIDGETS_UNITTESTS_CSCROLLBARVERTICAL_CSCROLLBARVERTICALTEST_HXX
diff --git a/graphics/nxwidgets/UnitTests/CSliderHorizonal/csliderhorizontaltest.hxx b/graphics/nxwidgets/UnitTests/CSliderHorizonal/csliderhorizontaltest.hxx
index 1441ed5..2ccd185 100644
--- a/graphics/nxwidgets/UnitTests/CSliderHorizonal/csliderhorizontaltest.hxx
+++ b/graphics/nxwidgets/UnitTests/CSliderHorizonal/csliderhorizontaltest.hxx
@@ -33,8 +33,8 @@
//
//////////////////////////////////////////////////////////////////////////////
-#ifndef __UNITTESTS_CSLIDERHORIZONTAL_CSLIDERHORIZONTALTEST_HXX
-#define __UNITTESTS_CSLIDERHORIZONTAL_CSLIDERHORIZONTALTEST_HXX
+#ifndef __APPS_GRAPHICS_NXWIDGETS_UNITTESTS_CSLIDERHORIZONTAL_CSLIDERHORIZONTALTEST_HXX
+#define __APPS_GRAPHICS_NXWIDGETS_UNITTESTS_CSLIDERHORIZONTAL_CSLIDERHORIZONTALTEST_HXX
/////////////////////////////////////////////////////////////////////////////
// Included Files
@@ -125,4 +125,4 @@ public:
// Public Function Prototypes
/////////////////////////////////////////////////////////////////////////////
-#endif // __UNITTESTS_CSLIDERHORIZONTAL_CSLIDERHORIZONTALTEST_HXX
+#endif // __APPS_GRAPHICS_NXWIDGETS_UNITTESTS_CSLIDERHORIZONTAL_CSLIDERHORIZONTALTEST_HXX
diff --git a/graphics/nxwidgets/UnitTests/CSliderVertical/csliderverticaltest.hxx b/graphics/nxwidgets/UnitTests/CSliderVertical/csliderverticaltest.hxx
index c75b763..5e27afa 100644
--- a/graphics/nxwidgets/UnitTests/CSliderVertical/csliderverticaltest.hxx
+++ b/graphics/nxwidgets/UnitTests/CSliderVertical/csliderverticaltest.hxx
@@ -33,8 +33,8 @@
//
//////////////////////////////////////////////////////////////////////////////
-#ifndef __UNITTESTS_CSLIDERVERTICAL_CSLIDERVERTICALTEST_HXX
-#define __UNITTESTS_CSLIDERVERTICAL_CSLIDERVERTICALTEST_HXX
+#ifndef __APPS_GRAPHICS_NXWIDGETS_UNITTESTS_CSLIDERVERTICAL_CSLIDERVERTICALTEST_HXX
+#define __APPS_GRAPHICS_NXWIDGETS_UNITTESTS_CSLIDERVERTICAL_CSLIDERVERTICALTEST_HXX
/////////////////////////////////////////////////////////////////////////////
// Included Files
@@ -125,4 +125,4 @@ public:
// Public Function Prototypes
/////////////////////////////////////////////////////////////////////////////
-#endif // __UNITTESTS_CSLIDERVERTICAL_CSLIDERVERTICALTEST_HXX
+#endif // __APPS_GRAPHICS_NXWIDGETS_UNITTESTS_CSLIDERVERTICAL_CSLIDERVERTICALTEST_HXX
diff --git a/graphics/nxwidgets/UnitTests/CTextBox/ctextboxtest.hxx b/graphics/nxwidgets/UnitTests/CTextBox/ctextboxtest.hxx
index 502ecfb..ffad480 100644
--- a/graphics/nxwidgets/UnitTests/CTextBox/ctextboxtest.hxx
+++ b/graphics/nxwidgets/UnitTests/CTextBox/ctextboxtest.hxx
@@ -33,8 +33,8 @@
//
//////////////////////////////////////////////////////////////////////////////
-#ifndef __UNITTESTS_CTEXTBOX_CTEXTBOXTEST_HXX
-#define __UNITTESTS_CTEXTBOX_CTEXTBOXTEST_HXX
+#ifndef __APPS_GRAPHICS_NXWIDGETS_UNITTESTS_CTEXTBOX_CTEXTBOXTEST_HXX
+#define __APPS_GRAPHICS_NXWIDGETS_UNITTESTS_CTEXTBOX_CTEXTBOXTEST_HXX
/////////////////////////////////////////////////////////////////////////////
// Included Files
@@ -139,4 +139,4 @@ public:
/////////////////////////////////////////////////////////////////////////////
-#endif // __UNITTESTS_CTEXTBOX_CTEXTBOXTEST_HXX
+#endif // __APPS_GRAPHICS_NXWIDGETS_UNITTESTS_CTEXTBOX_CTEXTBOXTEST_HXX
diff --git a/include/graphics/nxwm/capplicationwindow.hxx b/include/graphics/nxwm/capplicationwindow.hxx
index 631d1c6..5362a3f 100644
--- a/include/graphics/nxwm/capplicationwindow.hxx
+++ b/include/graphics/nxwm/capplicationwindow.hxx
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __APPS_INCLUDE_GRAPHICS_NXWM_CAPPLICATIONWINDOW_NXX
-#define __APPS_INCLUDE_GRAPHICS_NXWM_CAPPLICATIONWINDOW_NXX
+#ifndef __APPS_INCLUDE_GRAPHICS_NXWM_CAPPLICATIONWINDOW_HXX
+#define __APPS_INCLUDE_GRAPHICS_NXWM_CAPPLICATIONWINDOW_HXX
/****************************************************************************
* Included Files
@@ -193,4 +193,4 @@ namespace NxWM
#endif // __cplusplus
-#endif // __APPS_INCLUDE_GRAPHICS_NXWM_CAPPLICATIONWINDOW_NXX
+#endif // __APPS_INCLUDE_GRAPHICS_NXWM_CAPPLICATIONWINDOW_HXX
diff --git a/include/graphics/nxwm/cfullscreenwindow.hxx b/include/graphics/nxwm/cfullscreenwindow.hxx
index bd3e434..b037984 100644
--- a/include/graphics/nxwm/cfullscreenwindow.hxx
+++ b/include/graphics/nxwm/cfullscreenwindow.hxx
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __APPS_INCLUDE_GRAPHICS_NXWM_CFULLSCREENWINDOW_NXX
-#define __APPS_INCLUDE_GRAPHICS_NXWM_CFULLSCREENWINDOW_NXX
+#ifndef __APPS_INCLUDE_GRAPHICS_NXWM_CFULLSCREENWINDOW_HXX
+#define __APPS_INCLUDE_GRAPHICS_NXWM_CFULLSCREENWINDOW_HXX
/****************************************************************************
* Included Files
@@ -145,4 +145,4 @@ namespace NxWM
#endif // __cplusplus
-#endif // __APPS_INCLUDE_GRAPHICS_NXWM_CFULLSCREENWINDOW_NXX
+#endif // __APPS_INCLUDE_GRAPHICS_NXWM_CFULLSCREENWINDOW_HXX
diff --git a/include/graphics/nxwm/ckeyboard.hxx b/include/graphics/nxwm/ckeyboard.hxx
index 373b9b9..f810f6a 100644
--- a/include/graphics/nxwm/ckeyboard.hxx
+++ b/include/graphics/nxwm/ckeyboard.hxx
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __NXWM_INCLUDE_CKEYBOARD_HXX
-#define __NXWM_INCLUDE_CKEYBOARD_HXX
+#ifndef __NXWM_INCLUDE_GRAPHICS_NXWM_CKEYBOARD_HXX
+#define __NXWM_INCLUDE_GRAPHICS_NXWM_CKEYBOARD_HXX
/****************************************************************************
* Included Files
@@ -153,4 +153,4 @@ namespace NxWM
};
}
-#endif // __NXWM_INCLUDE_CKEYBOARD_HXX
+#endif // __NXWM_INCLUDE_GRAPHICS_CKEYBOARD_HXX
diff --git a/include/graphics/nxwm/cstartwindow.hxx b/include/graphics/nxwm/cstartwindow.hxx
index 441a414..a3a6c87 100644
--- a/include/graphics/nxwm/cstartwindow.hxx
+++ b/include/graphics/nxwm/cstartwindow.hxx
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __APPS_INCLUDE_GRAPHICS_NXWM_CSTARTWINDOW_NXX
-#define __APPS_INCLUDE_GRAPHICS_NXWM_CSTARTWINDOW_NXX
+#ifndef __APPS_INCLUDE_GRAPHICS_NXWM_CSTARTWINDOW_HXX
+#define __APPS_INCLUDE_GRAPHICS_NXWM_CSTARTWINDOW_HXX
/****************************************************************************
* Included Files
@@ -274,4 +274,4 @@ namespace NxWM
#endif // __cplusplus
-#endif // __APPS_INCLUDE_GRAPHICS_NXWM_CSTARTWINDOW_NXX
+#endif // __APPS_INCLUDE_GRAPHICS_NXWM_CSTARTWINDOW_HXX
diff --git a/include/graphics/nxwm/ctaskbar.hxx b/include/graphics/nxwm/ctaskbar.hxx
index 7c65a93..295a173 100644
--- a/include/graphics/nxwm/ctaskbar.hxx
+++ b/include/graphics/nxwm/ctaskbar.hxx
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __NXWM_INCLUDE_CTASKBAR_HXX
-#define __NXWM_INCLUDE_CTASKBAR_HXX
+#ifndef __NXWM_INCLUDE_GRAPHICS_NXWM_CTASKBAR_HXX
+#define __NXWM_INCLUDE_GRAPHICS_NXWM_CTASKBAR_HXX
/****************************************************************************
* Included Files
@@ -406,4 +406,4 @@ namespace NxWM
}
#endif // __cplusplus
-#endif // __NXWM_INCLUDE_CTASKBAR_HXX
+#endif // __NXWM_INCLUDE_GRAPHICS_NXWM_CTASKBAR_HXX
diff --git a/include/graphics/nxwm/iapplication.hxx b/include/graphics/nxwm/iapplication.hxx
index 708f1e5..e671304 100644
--- a/include/graphics/nxwm/iapplication.hxx
+++ b/include/graphics/nxwm/iapplication.hxx
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __APPS_INCLUDE_GRAPHICS_NXWM_IAPPLICATION_NXX
-#define __APPS_INCLUDE_GRAPHICS_NXWM_IAPPLICATION_NXX
+#ifndef __APPS_INCLUDE_GRAPHICS_NXWM_IAPPLICATION_HXX
+#define __APPS_INCLUDE_GRAPHICS_NXWM_IAPPLICATION_HXX
/****************************************************************************
* Included Files
@@ -232,4 +232,4 @@ namespace NxWM
#endif // __cplusplus
-#endif // __APPS_INCLUDE_GRAPHICS_NXWM_IAPPLICATION_NXX
+#endif // __APPS_INCLUDE_GRAPHICS_NXWM_IAPPLICATION_HXX
diff --git a/include/graphics/nxwm/iapplicationwindow.hxx b/include/graphics/nxwm/iapplicationwindow.hxx
index 76590c9..d702869 100644
--- a/include/graphics/nxwm/iapplicationwindow.hxx
+++ b/include/graphics/nxwm/iapplicationwindow.hxx
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __APPS_INCLUDE_GRAPHICS_NXWM_IAPPLICATIONWINDOW_NXX
-#define __APPS_INCLUDE_GRAPHICS_NXWM_IAPPLICATIONWINDOW_NXX
+#ifndef __APPS_INCLUDE_GRAPHICS_NXWM_IAPPLICATIONWINDOW_HXX
+#define __APPS_INCLUDE_GRAPHICS_NXWM_IAPPLICATIONWINDOW_HXX
/****************************************************************************
* Included Files
@@ -164,4 +164,4 @@ namespace NxWM
#endif // __cplusplus
-#endif // __APPS_INCLUDE_GRAPHICS_NXWM_IAPPLICATIONWINDOW_NXX
+#endif // __APPS_INCLUDE_GRAPHICS_NXWM_IAPPLICATIONWINDOW_HXX
diff --git a/include/graphics/slcd.hxx b/include/graphics/slcd.hxx
index 823bf33..e1b1bb7 100644
--- a/include/graphics/slcd.hxx
+++ b/include/graphics/slcd.hxx
@@ -18,8 +18,8 @@
//
/////////////////////////////////////////////////////////////////////////////
-#ifndef __APPS_INCLUDE_GRAPHICS_SLCD_H
-#define __APPS_INCLUDE_GRAPHICS_SLCD_H
+#ifndef __APPS_INCLUDE_GRAPHICS_SLCD_HXX
+#define __APPS_INCLUDE_GRAPHICS_SLCD_HXX
/////////////////////////////////////////////////////////////////////////////
// Included Files
@@ -194,4 +194,4 @@ namespace SLcd
};
}
-#endif /* __APPS_INCLUDE_GRAPHICS_SLCD_H */
+#endif /* __APPS_INCLUDE_GRAPHICS_SLCD_HXX */
diff --git a/netutils/iperf/iperf.h b/netutils/iperf/iperf.h
index 7a9dbfd..f4e56da 100644
--- a/netutils/iperf/iperf.h
+++ b/netutils/iperf/iperf.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __IPERF_H_
-#define __IPERF_H_
+#ifndef __APPS_NETUTILS_IPERF_IPERF_H
+#define __APPS_NETUTILS_IPERF_IPERF_H
/****************************************************************************
* Included Files
@@ -94,4 +94,4 @@ int iperf_stop(void);
#undef EXTERN
#endif /* __ASSEMBLY__ */
-#endif
+#endif /* __APPS_NETUTILS_IPERF_IPERF_H */
diff --git a/netutils/libcurl4nx/curl4nx_private.h b/netutils/libcurl4nx/curl4nx_private.h
index 11c3112..cdc45f9 100644
--- a/netutils/libcurl4nx/curl4nx_private.h
+++ b/netutils/libcurl4nx/curl4nx_private.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __APPS_NETUTILS_CURL4NX_CURL4NX_PRIVATE_H
-#define __APPS_NETUTILS_CURL4NX_CURL4NX_PRIVATE_H
+#ifndef __APPS_NETUTILS_LIBCURL4NX_CURL4NX_PRIVATE_H
+#define __APPS_NETUTILS_LIBCURL4NX_CURL4NX_PRIVATE_H
/****************************************************************************
* Included Files
@@ -170,4 +170,4 @@ struct curl4nx_s
* Public Function Prototypes
****************************************************************************/
-#endif /* __APPS_NETLIB_CURL4NX_CURL4NX_PRIVATE_H */
+#endif /* __APPS_NETUTILS_LIBCURL4NX_CURL4NX_PRIVATE_H */
diff --git a/netutils/tftpc/tftpc_internal.h b/netutils/tftpc/tftpc_internal.h
index 480d7fc..6174b82 100644
--- a/netutils/tftpc/tftpc_internal.h
+++ b/netutils/tftpc/tftpc_internal.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __NETUTILS_TFTP_TFTPC_INTERNAL_H
-#define __NETUTILS_TFTP_TFTPC_INTERNAL_H
+#ifndef __APPS_NETUTILS_TFTP_TFTPC_INTERNAL_H
+#define __APPS_NETUTILS_TFTP_TFTPC_INTERNAL_H
/****************************************************************************
* Included Files
@@ -178,4 +178,4 @@ extern ssize_t tftp_sendto(int sd, const void *buf,
# define tftp_dumpbuffer(msg, buffer, nbytes)
#endif
-#endif /* __NETUTILS_TFTP_TFTPC_INTERNAL_H */
+#endif /* __APPS_NETUTILS_TFTP_TFTPC_INTERNAL_H */
diff --git a/netutils/thttpd/config.h b/netutils/thttpd/config.h
index d389df8..06c1233 100644
--- a/netutils/thttpd/config.h
+++ b/netutils/thttpd/config.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __NETUTILS_THTTPD_CONFIG_H
-#define __NETUTILS_THTTPD_CONFIG_H
+#ifndef __APPS_NETUTILS_THTTPD_CONFIG_H
+#define __APPS_NETUTILS_THTTPD_CONFIG_H
/****************************************************************************
* Included Files
@@ -249,10 +249,10 @@
* verify referrers.
*/
-#else /* Dependencies not provided */
+#else /* Dependencies not provided */
# ifdef CONFIG_CPP_HAVE_WARNING
# warning "THTTPD not built because dependencies not selected in configuration"
# endif
#endif /* Dependencies not provided */
-#endif /* __NETUTILS_THTTPD_CONFIG_H */
+#endif /* __APPS_NETUTILS_THTTPD_CONFIG_H */
diff --git a/netutils/thttpd/fdwatch.h b/netutils/thttpd/fdwatch.h
index 86a190f..4cb67aa 100644
--- a/netutils/thttpd/fdwatch.h
+++ b/netutils/thttpd/fdwatch.h
@@ -6,7 +6,7 @@
*
* Derived from the file of the same name in THTTPD:
*
- * Copyright � 1999 by Jef Poskanzer <je...@mail.acme.com>.
+ * Copyright (C) 1999 by Jef Poskanzer <je...@mail.acme.com>.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -33,8 +33,8 @@
*
****************************************************************************/
-#ifndef __NETUTILS_THTTPD_FDWATCH_H
-#define __NETUTILS_THTTPD_FDWATCH_H
+#ifndef __APPS_NETUTILS_THTTPD_FDWATCH_H
+#define __APPS_NETUTILS_THTTPD_FDWATCH_H
/****************************************************************************
* Included Files
@@ -56,7 +56,7 @@
#endif
/****************************************************************************
- * Private Types
+ * Public Types
****************************************************************************/
struct fdwatch_s
@@ -107,4 +107,4 @@ extern int fdwatch_check_fd(struct fdwatch_s *fw, int fd);
extern void *fdwatch_get_next_client_data(struct fdwatch_s *fw);
-#endif /* __NETUTILS_THTTPD_FDWATCH_H */
+#endif /* __APPS_NETUTILS_THTTPD_FDWATCH_H */
diff --git a/netutils/thttpd/libhttpd.h b/netutils/thttpd/libhttpd.h
index f67802c..bdb199b 100644
--- a/netutils/thttpd/libhttpd.h
+++ b/netutils/thttpd/libhttpd.h
@@ -7,7 +7,7 @@
*
* Derived from the file of the same name in the original THTTPD package:
*
- * Copyright � 1995,1998,1999,2000,2001 by Jef Poskanzer <je...@mail.acme.com>.
+ * Copyright (C) 1995,1998,1999,2000,2001 by Jef Poskanzer <je...@mail.acme.com>.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -34,8 +34,8 @@
*
****************************************************************************/
-#ifndef __NETUTILS_THTTPD_LIBHTTPD_H
-#define __NETUTILS_THTTPD_LIBHTTPD_H
+#ifndef __APPS_NETUTILS_THTTPD_LIBHTTPD_H
+#define __APPS_NETUTILS_THTTPD_LIBHTTPD_H
/****************************************************************************
* Included Files
@@ -339,4 +339,4 @@ extern int httpd_read(int fd, const void *buf, size_t nbytes);
extern int httpd_write(int fd, const void *buf, size_t nbytes);
#endif /* CONFIG_THTTPD */
-#endif /* __NETUTILS_THTTPD_LIBHTTPD_H */
+#endif /* __APPS_NETUTILS_THTTPD_LIBHTTPD_H */
diff --git a/netutils/thttpd/mime_types.h b/netutils/thttpd/mime_types.h
index 0faf19e..5c14a74 100644
--- a/netutils/thttpd/mime_types.h
+++ b/netutils/thttpd/mime_types.h
@@ -37,8 +37,8 @@
*
****************************************************************************/
-#ifndef __NETUTILS_THTTPD_MIME_TYPES_H
-#define __NETUTILS_THTTPD_MIME_TYPES_H
+#ifndef __APPS_NETUTILS_THTTPD_MIME_TYPES_H
+#define __APPS_NETUTILS_THTTPD_MIME_TYPES_H
/****************************************************************************
* Included Files
@@ -275,4 +275,4 @@ static struct mime_entry typ_tab[] =
};
static const int n_typ_tab = sizeof(typ_tab) / sizeof(*typ_tab);
-#endif /* __NETUTILS_THTTPD_MIME_TYPES_H */
+#endif /* __APPS_NETUTILS_THTTPD_MIME_TYPES_H */
diff --git a/netutils/thttpd/tdate_parse.h b/netutils/thttpd/tdate_parse.h
index 7729ad3..8b98430 100644
--- a/netutils/thttpd/tdate_parse.h
+++ b/netutils/thttpd/tdate_parse.h
@@ -1,12 +1,12 @@
/****************************************************************************
- * apps/netutils/thttpd/fdwatch.h
+ * apps/netutils/thttpd/tdate_parse.h
*
* Copyright (C) 2009 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gn...@nuttx.org>
*
* Derived from the file of the same name in THTTPD:
*
- * Copyright � 1995 by Jef Poskanzer <je...@mail.acme.com>.
+ * Copyright (C) 1995 by Jef Poskanzer <je...@mail.acme.com>.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -33,9 +33,9 @@
*
****************************************************************************/
-#ifndef __NETUTILS_TDATE_PARSE_H
-#define __NETUTILS_TDATE_PARSE_H
+#ifndef __APPS_NETUTILS_THTTPD_TDATE_PARSE_H
+#define __APPS_NETUTILS_THTTPD_TDATE_PARSE_H
extern time_t tdate_parse(char *str);
-#endif /* __NETUTILS_TDATE_PARSE_H */
+#endif /* __APPS_NETUTILS_THTTPD_TDATE_PARSE_H */
diff --git a/netutils/thttpd/thttpd_alloc.h b/netutils/thttpd/thttpd_alloc.h
index 758c58a..639e74d 100644
--- a/netutils/thttpd/thttpd_alloc.h
+++ b/netutils/thttpd/thttpd_alloc.h
@@ -33,8 +33,8 @@
*
****************************************************************************/
-#ifndef __NETUTILS_THTTPD_HTTDP_ALLOC_H
-#define __NETUTILS_THTTPD_HTTDP_ALLOC_H
+#ifndef __APPS_NETUTILS_THTTPD_THTTDP_ALLOC_H
+#define __APPS_NETUTILS_THTTPD_THTTDP_ALLOC_H
/****************************************************************************
* Included Files
@@ -75,4 +75,4 @@ extern FAR char *httpd_strdup(const char *str);
extern void httpd_realloc_str(char **pstr, size_t *maxsizeP, size_t size);
#endif /* CONFIG_THTTPD */
-#endif /* __NETUTILS_THTTPD_HTTDP_ALLOC_H */
+#endif /* __APPS_NETUTILS_THTTPD_THTTDP_ALLOC_H */
diff --git a/netutils/thttpd/thttpd_cgi.h b/netutils/thttpd/thttpd_cgi.h
index 2640789..ea83efe 100644
--- a/netutils/thttpd/thttpd_cgi.h
+++ b/netutils/thttpd/thttpd_cgi.h
@@ -7,7 +7,7 @@
*
* Derived from the file libhttpd.c in the original THTTPD package:
*
- * Copyright � 1995,1998,1999,2000,2001 by Jef Poskanzer <je...@mail.acme.com>.
+ * Copyright (C) 1995,1998,1999,2000,2001 by Jef Poskanzer <je...@mail.acme.com>.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -34,8 +34,8 @@
*
****************************************************************************/
-#ifndef __HTTPD_CGI_H
-#define __HTTPD_CGI_H
+#ifndef __APPS_NETUTILS_THTTPD_THTTPD_CGI_H
+#define __APPS_NETUTILS_THTTPD_THTTPD_CGI_H
/****************************************************************************
* Included Files
diff --git a/netutils/thttpd/thttpd_strings.h b/netutils/thttpd/thttpd_strings.h
index 5e9737d..cb7e29f 100644
--- a/netutils/thttpd/thttpd_strings.h
+++ b/netutils/thttpd/thttpd_strings.h
@@ -7,7 +7,7 @@
*
* Derived from the file of the same name in the original THTTPD package:
*
- * Copyright � 1995,1998,1999,2000,2001 by Jef Poskanzer <je...@mail.acme.com>.
+ * Copyright (C) 1995,1998,1999,2000,2001 by Jef Poskanzer <je...@mail.acme.com>.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -34,8 +34,8 @@
*
****************************************************************************/
-#ifndef __NETUTILS_THTTPD_THTTPD_STRINGS_H
-#define __NETUTILS_THTTPD_THTTPD_STRINGS_H
+#ifndef __APPS_NETUTILS_THTTPD_THTTPD_STRINGS_H
+#define __APPS_NETUTILS_THTTPD_THTTPD_STRINGS_H
/****************************************************************************
* Included Files
@@ -106,7 +106,7 @@ extern const char html_hdr2[];
extern const char html_endhdr2[];
/****************************************************************************
- * Public Functions
+ * Public Function Prototypes
****************************************************************************/
/* Copies and decodes a string. It's ok for from and to to be the same string. */
@@ -120,4 +120,4 @@ void httpd_strencode(char *to, int tosize, char *from);
#endif
#endif /* CONFIG_THTTPD */
-#endif /* __NETUTILS_THTTPD_THTTPD_STRINGS_H */
+#endif /* __APPS_NETUTILS_THTTPD_THTTPD_STRINGS_H */
diff --git a/netutils/thttpd/timers.h b/netutils/thttpd/timers.h
index 6cd98ba..185aeba 100644
--- a/netutils/thttpd/timers.h
+++ b/netutils/thttpd/timers.h
@@ -7,7 +7,7 @@
*
* Derived from the file of the same name in THTTPD:
*
- * Copyright � 1995,1998,1999,2000 by Jef Poskanzer <je...@mail.acme.com>.
+ * Copyright (C) 1995,1998,1999,2000 by Jef Poskanzer <je...@mail.acme.com>.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -34,8 +34,8 @@
*
****************************************************************************/
-#ifndef __NETUTILS_THTTPD_TIMERS_H
-#define __NETUTILS_THTTPD_TIMERS_H
+#ifndef __APPS_NETUTILS_THTTPD_TIMERS_H
+#define __APPS_NETUTILS_THTTPD_TIMERS_H
/****************************************************************************
* Included Files
@@ -132,4 +132,4 @@ extern void tmr_cleanup(void);
extern void tmr_destroy(void);
-#endif /* __NETUTILS_THTTPD_TIMERS_H */
+#endif /* __APPS_NETUTILS_THTTPD_TIMERS_H */
diff --git a/netutils/usrsock_rpmsg/usrsock_rpmsg.h b/netutils/usrsock_rpmsg/usrsock_rpmsg.h
index 9559a36..4c0b1bd 100644
--- a/netutils/usrsock_rpmsg/usrsock_rpmsg.h
+++ b/netutils/usrsock_rpmsg/usrsock_rpmsg.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __NETUTILS_USRSOCK_RPMSG_H
-#define __NETUTILS_USRSOCK_RPMSG_H
+#ifndef __APPS_NETUTILS_USRSOCK_RPMSG_H
+#define __APPS_NETUTILS_USRSOCK_RPMSG_H
/****************************************************************************
* Included Files
@@ -48,4 +48,4 @@ begin_packed_struct struct usrsock_rpmsg_dns_event_s
uint16_t addrlen;
} end_packed_struct;
-#endif /* __NETUTILS_USRSOCK_RPMSG_H */
+#endif /* __APPS_NETUTILS_USRSOCK_RPMSG_H */
diff --git a/system/cu/cu.h b/system/cu/cu.h
index 521c5be..032d036 100644
--- a/system/cu/cu.h
+++ b/system/cu/cu.h
@@ -33,8 +33,8 @@
*
****************************************************************************/
-#ifndef __APPS_SYSTEM_CU_CUTERM_H
-#define __APPS_SYSTEM_CU_CUTERM_H
+#ifndef __APPS_SYSTEM_CU_CU_H
+#define __APPS_SYSTEM_CU_CU_H
/****************************************************************************
* Included Files
@@ -83,4 +83,4 @@ struct cu_globals_s
* Public Function Prototypes
****************************************************************************/
-#endif /* __APPS_SYSTEM_CU_CUTERM_H */
+#endif /* __APPS_SYSTEM_CU_CU_H */
diff --git a/wireless/bluetooth/btsak/btsak.h b/wireless/bluetooth/btsak/btsak.h
index c3b38e2..8413699 100644
--- a/wireless/bluetooth/btsak/btsak.h
+++ b/wireless/bluetooth/btsak/btsak.h
@@ -23,8 +23,8 @@
* Intel/Zephyr Arduino 101 package (BSD license).
*/
-#ifndef __APPS_EXAMPLES_WIRELESS_BLUETOOTH_BTSAK_BTSAK_H
-#define __APPS_EXAMPLES_WIRELESS_BLUETOOTH_BTSAK_BTSAK_H
+#ifndef __APPS_WIRELESS_BLUETOOTH_BTSAK_BTSAK_H
+#define __APPS_WIRELESS_BLUETOOTH_BTSAK_BTSAK_H
/****************************************************************************
* Included Files
@@ -257,4 +257,4 @@ void btsak_cmd_gatt_read_multiple(FAR struct btsak_s *btsak, int argc,
void btsak_cmd_gatt_write(FAR struct btsak_s *btsak, int argc,
FAR char *argv[]);
-#endif /* __APPS_EXAMPLES_WIRELESS_BLUETOOTH_BTSAK_BTSAK_H */
+#endif /* __APPS_WIRELESS_BLUETOOTH_BTSAK_BTSAK_H */
diff --git a/wireless/ieee802154/i8sak/i8sak.h b/wireless/ieee802154/i8sak/i8sak.h
index 729f988..84549b6 100644
--- a/wireless/ieee802154/i8sak/i8sak.h
+++ b/wireless/ieee802154/i8sak/i8sak.h
@@ -39,8 +39,8 @@
*
****************************************************************************/
-#ifndef __APPS_EXAMPLES_WIRELESS_IEEE802154_I8SAK_I8SAK_H
-#define __APPS_EXAMPLES_WIRELESS_IEEE802154_I8SAK_I8SAK_H
+#ifndef __APPS_WIRELESS_IEEE802154_I8SAK_I8SAK_H
+#define __APPS_WIRELESS_IEEE802154_I8SAK_I8SAK_H
/****************************************************************************
* Included Files
@@ -310,4 +310,4 @@ static inline void i8sak_update_ep_ip(FAR struct i8sak_s *i8sak)
}
#endif
-#endif /* __APPS_EXAMPLES_WIRELESS_IEEE802154_I8SAK_I8SAK_H */
+#endif /* __APPS_WIRELESS_IEEE802154_I8SAK_I8SAK_H */
diff --git a/wireless/ieee802154/i8sak/i8sak_events.h b/wireless/ieee802154/i8sak/i8sak_events.h
index 65382de..0c63b47 100644
--- a/wireless/ieee802154/i8sak/i8sak_events.h
+++ b/wireless/ieee802154/i8sak/i8sak_events.h
@@ -33,8 +33,8 @@
*
****************************************************************************/
-#ifndef __APPS_WIRELESS_IEEE802154_I8SAK_EVENTS_H
-#define __APPS_WIRELESS_IEEE802154_I8SAK_EVENTS_H
+#ifndef __APPS_WIRELESS_IEEE802154_I8SAK_I8SAK_EVENTS_H
+#define __APPS_WIRELESS_IEEE802154_I8SAK_I8SAK_EVENTS_H
/****************************************************************************
* Included Files
@@ -48,6 +48,7 @@
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
+
/* Configuration ************************************************************/
#if !defined(CONFIG_I8SAK_NEVENTRECEIVERS) || CONFIG_I8SAK_NEVENTRECEIVERS <= 0
@@ -75,7 +76,8 @@ struct i8sak_eventfilter_s
uint32_t syncloss : 1;
} indevents;
- struct {
+ struct
+ {
uint32_t data : 1;
uint32_t assoc : 1;
uint32_t disassoc : 1;
@@ -99,7 +101,7 @@ struct i8sak_eventreceiver_s
};
/****************************************************************************
- * Public Functions
+ * Public Function Prototypes
****************************************************************************/
/* Forware Reference */
@@ -192,4 +194,4 @@ int i8sak_eventlistener_addreceiver(FAR struct i8sak_s *i8sak,
int i8sak_eventlistener_removereceiver(FAR struct i8sak_s *handle,
i8sak_eventcallback_t cb);
-#endif /* __APPS_WIRELESS_IEEE802154_I8SAK_EVENTS_H */
+#endif /* __APPS_WIRELESS_IEEE802154_I8SAK_I8SAK_EVENTS_H */