diff --git a/ChangeLog b/ChangeLog index 80e9b51499..1dd1bee589 100755 --- a/ChangeLog +++ b/ChangeLog @@ -2741,7 +2741,7 @@ the worker thread, disabling interrupts does not provide protected; Need to disable pre-emption. (2) Fix handling of touch ID and (2) add some logic to prevent certain kinds of data overrun. - * include/nx/nxtk.h and graphics/nx/nxtk/nxtk_internal.h: Move setting + * include/nx/nxtk.h and graphics/nx/nxtk/nxtk.h: Move setting of configuration defaults from the internal header file to a place where other logic can use the defaults. * graphics/nxtk/nxtk_events.c: Fixed an important but in the logic that diff --git a/Documentation b/Documentation index 601bc2284c..c825944849 160000 --- a/Documentation +++ b/Documentation @@ -1 +1 @@ -Subproject commit 601bc2284cb4ff212ae6f1bb09cb9e0733bd1b38 +Subproject commit c82594484958132e9267cd7bacb47579874a12ba diff --git a/configs b/configs index 9ab677b8e1..f6782b7548 160000 --- a/configs +++ b/configs @@ -1 +1 @@ -Subproject commit 9ab677b8e16ab2d2d1a7ac25893503ce0fadabde +Subproject commit f6782b75481a49e19709a7e1593d40346716f5e4 diff --git a/drivers/mmcsd/mmcsd_internal.h b/drivers/mmcsd/mmcsd.h similarity index 96% rename from drivers/mmcsd/mmcsd_internal.h rename to drivers/mmcsd/mmcsd.h index 36843685d8..06d91348d0 100644 --- a/drivers/mmcsd/mmcsd_internal.h +++ b/drivers/mmcsd/mmcsd.h @@ -1,5 +1,5 @@ /**************************************************************************** - * drivers/mmcsd/mmcsd_internal.h + * drivers/mmcsd/mmcsd.h * * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __DRIVERS_MMCSD_MMCSD_INTERNAL_H -#define __DRIVERS_MMCSD_MMCSD_INTERNAL_H +#ifndef __DRIVERS_MMCSD_MMCSD_H +#define __DRIVERS_MMCSD_MMCSD_H /**************************************************************************** * Included Files @@ -102,4 +102,4 @@ EXTERN void mmcsd_dmpcsd(FAR const uint8_t *csd, uint8_t cardtype); #if defined(__cplusplus) } #endif -#endif /* __DRIVERS_MMCSD_MMCSD_INTERNAL_H */ +#endif /* __DRIVERS_MMCSD_MMCSD_H */ diff --git a/drivers/mmcsd/mmcsd_debug.c b/drivers/mmcsd/mmcsd_debug.c index ea3788a29b..e28b985a02 100644 --- a/drivers/mmcsd/mmcsd_debug.c +++ b/drivers/mmcsd/mmcsd_debug.c @@ -47,7 +47,7 @@ #include #include "mmcsd_csd.h" -#include "mmcsd_internal.h" +#include "mmcsd.h" /**************************************************************************** * Pre-processor Definitions diff --git a/drivers/mmcsd/mmcsd_sdio.c b/drivers/mmcsd/mmcsd_sdio.c index 2a1be9595d..d8ae4561af 100644 --- a/drivers/mmcsd/mmcsd_sdio.c +++ b/drivers/mmcsd/mmcsd_sdio.c @@ -65,7 +65,7 @@ #include #include -#include "mmcsd_internal.h" +#include "mmcsd.h" #include "mmcsd_sdio.h" /**************************************************************************** diff --git a/drivers/mmcsd/mmcsd_spi.c b/drivers/mmcsd/mmcsd_spi.c index 64f67a797d..7219648845 100644 --- a/drivers/mmcsd/mmcsd_spi.c +++ b/drivers/mmcsd/mmcsd_spi.c @@ -59,7 +59,7 @@ #include "mmcsd_spi.h" #include "mmcsd_csd.h" -#include "mmcsd_internal.h" +#include "mmcsd.h" /**************************************************************************** * Pre-processor Definitions diff --git a/libc/aio/lio_listio.c b/libc/aio/lio_listio.c index 0889fd9b14..b552817e09 100644 --- a/libc/aio/lio_listio.c +++ b/libc/aio/lio_listio.c @@ -45,7 +45,7 @@ #include #include -#include "lib_internal.h" +#include "libc.h" #include "aio/aio.h" #ifdef CONFIG_FS_AIO diff --git a/libc/audio/lib_buffer.c b/libc/audio/lib_buffer.c index f69a2066ed..f7e29dd033 100644 --- a/libc/audio/lib_buffer.c +++ b/libc/audio/lib_buffer.c @@ -52,7 +52,7 @@ #include #include -#include "lib_internal.h" +#include "libc.h" #if defined(CONFIG_AUDIO) diff --git a/libc/lib_internal.h b/libc/libc.h similarity index 98% rename from libc/lib_internal.h rename to libc/libc.h index 29bbd136f5..9cb1974fa9 100644 --- a/libc/lib_internal.h +++ b/libc/libc.h @@ -1,5 +1,5 @@ /**************************************************************************** - * libc/lib_internal.h + * libc/libc.h * * Copyright (C) 2007-2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __LIBC_LIB_INTERNAL_H -#define __LIBC_LIB_INTERNAL_H +#ifndef __LIBC_LIBC_H +#define __LIBC_LIBC_H /**************************************************************************** * Included Files @@ -233,4 +233,4 @@ ssize_t lib_parse_hostfile(FAR FILE *stream, FAR struct hostent *host, } #endif -#endif /* __LIBC_LIB_INTERNAL_H */ +#endif /* __LIBC_LIBC_H */ diff --git a/libc/math/lib_exp.c b/libc/math/lib_exp.c index 738bd3f76b..211b23bf95 100644 --- a/libc/math/lib_exp.c +++ b/libc/math/lib_exp.c @@ -35,7 +35,7 @@ #include #include -#include "lib_internal.h" +#include "libc.h" #ifdef CONFIG_HAVE_DOUBLE diff --git a/libc/math/lib_expf.c b/libc/math/lib_expf.c index 36788b60ad..4ce5208607 100644 --- a/libc/math/lib_expf.c +++ b/libc/math/lib_expf.c @@ -32,7 +32,7 @@ #include #include -#include "lib_internal.h" +#include "libc.h" /**************************************************************************** * Private Data diff --git a/libc/math/lib_expl.c b/libc/math/lib_expl.c index 29f30ecd13..1021017ca3 100644 --- a/libc/math/lib_expl.c +++ b/libc/math/lib_expl.c @@ -35,7 +35,7 @@ #include #include -#include "lib_internal.h" +#include "libc.h" #ifdef CONFIG_HAVE_LONG_DOUBLE diff --git a/libc/math/lib_sqrt.c b/libc/math/lib_sqrt.c index 7a3af561c6..8540744d21 100644 --- a/libc/math/lib_sqrt.c +++ b/libc/math/lib_sqrt.c @@ -35,7 +35,7 @@ #include #include -#include "lib_internal.h" +#include "libc.h" /**************************************************************************** * Public Functions diff --git a/libc/math/lib_sqrtf.c b/libc/math/lib_sqrtf.c index 0e9a55ac24..e1a107eb8b 100644 --- a/libc/math/lib_sqrtf.c +++ b/libc/math/lib_sqrtf.c @@ -35,7 +35,7 @@ #include #include -#include "lib_internal.h" +#include "libc.h" /**************************************************************************** * Public Functions diff --git a/libc/math/lib_sqrtl.c b/libc/math/lib_sqrtl.c index 15280a83f9..03a564f72d 100644 --- a/libc/math/lib_sqrtl.c +++ b/libc/math/lib_sqrtl.c @@ -35,7 +35,7 @@ #include #include -#include "lib_internal.h" +#include "libc.h" /**************************************************************************** * Public Functions diff --git a/libc/misc/lib_dbg.c b/libc/misc/lib_dbg.c index aa0b857bb1..14044175b7 100644 --- a/libc/misc/lib_dbg.c +++ b/libc/misc/lib_dbg.c @@ -42,7 +42,7 @@ #include #include -#include "lib_internal.h" +#include "libc.h" #ifndef CONFIG_CPP_HAVE_VARARGS diff --git a/libc/misc/lib_filesem.c b/libc/misc/lib_filesem.c index da52b5ae36..2fd5d1c9eb 100644 --- a/libc/misc/lib_filesem.c +++ b/libc/misc/lib_filesem.c @@ -45,7 +45,7 @@ #include #include -#include "lib_internal.h" +#include "libc.h" #if CONFIG_STDIO_BUFFER_SIZE > 0 diff --git a/libc/misc/lib_ioctl.c b/libc/misc/lib_ioctl.c index fa0d908042..0e7ca015d3 100644 --- a/libc/misc/lib_ioctl.c +++ b/libc/misc/lib_ioctl.c @@ -46,7 +46,7 @@ #include -#include "lib_internal.h" +#include "libc.h" #if defined(CONFIG_LIBC_IOCTL_VARIADIC) && CONFIG_NFILE_DESCRIPTORS > 0 diff --git a/libc/misc/lib_sendfile.c b/libc/misc/lib_sendfile.c index 4fa19b66a7..2313833dc7 100644 --- a/libc/misc/lib_sendfile.c +++ b/libc/misc/lib_sendfile.c @@ -45,7 +45,7 @@ #include #include -#include "lib_internal.h" +#include "libc.h" #if CONFIG_NSOCKET_DESCRIPTORS > 0 || CONFIG_NFILE_DESCRIPTORS > 0 diff --git a/libc/misc/lib_stream.c b/libc/misc/lib_stream.c index 2ad3cd740e..f42b040cbb 100644 --- a/libc/misc/lib_stream.c +++ b/libc/misc/lib_stream.c @@ -48,7 +48,7 @@ #include #include -#include "lib_internal.h" +#include "libc.h" #if (!defined(CONFIG_BUILD_PROTECTED) && !defined(CONFIG_BUILD_KERNEL)) || \ defined(__KERNEL__) diff --git a/libc/misc/lib_streamsem.c b/libc/misc/lib_streamsem.c index a403b71028..9f26d96a72 100644 --- a/libc/misc/lib_streamsem.c +++ b/libc/misc/lib_streamsem.c @@ -46,7 +46,7 @@ #include #include -#include "lib_internal.h" +#include "libc.h" /**************************************************************************** * Private types diff --git a/libc/netdb/lib_gethostbyaddr.c b/libc/netdb/lib_gethostbyaddr.c index 46c4d6dd56..c06f165404 100644 --- a/libc/netdb/lib_gethostbyaddr.c +++ b/libc/netdb/lib_gethostbyaddr.c @@ -42,7 +42,7 @@ #include #include -#include "lib_internal.h" +#include "libc.h" #include "netdb/lib_netdb.h" #ifdef CONFIG_NETDB_HOSTFILE diff --git a/libc/netdb/lib_gethostbyaddrr.c b/libc/netdb/lib_gethostbyaddrr.c index 812b1fedb9..6dcb8e8ab1 100644 --- a/libc/netdb/lib_gethostbyaddrr.c +++ b/libc/netdb/lib_gethostbyaddrr.c @@ -48,7 +48,7 @@ #include #include -#include "lib_internal.h" +#include "libc.h" #include "netdb/lib_netdb.h" #ifdef CONFIG_NETDB_HOSTFILE diff --git a/libc/netdb/lib_gethostbyname.c b/libc/netdb/lib_gethostbyname.c index 4aae74a204..aa492db779 100644 --- a/libc/netdb/lib_gethostbyname.c +++ b/libc/netdb/lib_gethostbyname.c @@ -42,7 +42,7 @@ #include #include -#include "lib_internal.h" +#include "libc.h" #include "netdb/lib_netdb.h" #ifdef CONFIG_LIBC_NETDB diff --git a/libc/netdb/lib_gethostbynamer.c b/libc/netdb/lib_gethostbynamer.c index 6b005743cf..747cf6a0c5 100644 --- a/libc/netdb/lib_gethostbynamer.c +++ b/libc/netdb/lib_gethostbynamer.c @@ -53,7 +53,7 @@ #include #include -#include "lib_internal.h" +#include "libc.h" #include "netdb/lib_dns.h" #ifdef CONFIG_LIBC_NETDB diff --git a/libc/netdb/lib_parsehostfile.c b/libc/netdb/lib_parsehostfile.c index 177c00a3f3..0e2c5bdeff 100644 --- a/libc/netdb/lib_parsehostfile.c +++ b/libc/netdb/lib_parsehostfile.c @@ -50,7 +50,7 @@ #include -#include "lib_internal.h" +#include "libc.h" #ifdef CONFIG_NETDB_HOSTFILE diff --git a/libc/spawn/lib_psfa_addclose.c b/libc/spawn/lib_psfa_addclose.c index eaf3e08892..3ee6f19083 100644 --- a/libc/spawn/lib_psfa_addclose.c +++ b/libc/spawn/lib_psfa_addclose.c @@ -46,7 +46,7 @@ #include -#include "lib_internal.h" +#include "libc.h" /**************************************************************************** * Public Functions diff --git a/libc/spawn/lib_psfa_adddup2.c b/libc/spawn/lib_psfa_adddup2.c index 5b4833c5b0..6473476275 100644 --- a/libc/spawn/lib_psfa_adddup2.c +++ b/libc/spawn/lib_psfa_adddup2.c @@ -46,7 +46,7 @@ #include -#include "lib_internal.h" +#include "libc.h" /**************************************************************************** * Public Functions diff --git a/libc/spawn/lib_psfa_addopen.c b/libc/spawn/lib_psfa_addopen.c index 4bb096efb7..7f22c06af8 100644 --- a/libc/spawn/lib_psfa_addopen.c +++ b/libc/spawn/lib_psfa_addopen.c @@ -47,7 +47,7 @@ #include -#include "lib_internal.h" +#include "libc.h" /**************************************************************************** * Public Functions diff --git a/libc/spawn/lib_psfa_destroy.c b/libc/spawn/lib_psfa_destroy.c index e4020304b1..73a5ea25f5 100644 --- a/libc/spawn/lib_psfa_destroy.c +++ b/libc/spawn/lib_psfa_destroy.c @@ -45,7 +45,7 @@ #include -#include "lib_internal.h" +#include "libc.h" /**************************************************************************** * Public Functions diff --git a/libc/stdio/lib_asprintf.c b/libc/stdio/lib_asprintf.c index 09e6f42e93..d61059f5b5 100644 --- a/libc/stdio/lib_asprintf.c +++ b/libc/stdio/lib_asprintf.c @@ -40,7 +40,7 @@ #include #include -#include "lib_internal.h" +#include "libc.h" /**************************************************************************** * Pre-processor Definitions diff --git a/libc/stdio/lib_dtoa.c b/libc/stdio/lib_dtoa.c index 68ae7b2098..e3452126d8 100644 --- a/libc/stdio/lib_dtoa.c +++ b/libc/stdio/lib_dtoa.c @@ -48,7 +48,7 @@ #include #include -#include "lib_internal.h" +#include "libc.h" /**************************************************************************** * Pre-processor Definitions diff --git a/libc/stdio/lib_fclose.c b/libc/stdio/lib_fclose.c index ff54efba4c..35301fc6bb 100644 --- a/libc/stdio/lib_fclose.c +++ b/libc/stdio/lib_fclose.c @@ -45,7 +45,7 @@ #include #include -#include "lib_internal.h" +#include "libc.h" /**************************************************************************** * Public Functions diff --git a/libc/stdio/lib_fflush.c b/libc/stdio/lib_fflush.c index bb3d0313cd..d56f8fb75c 100644 --- a/libc/stdio/lib_fflush.c +++ b/libc/stdio/lib_fflush.c @@ -46,7 +46,7 @@ #include -#include "lib_internal.h" +#include "libc.h" /**************************************************************************** * Pre-processor Definitions diff --git a/libc/stdio/lib_fgetc.c b/libc/stdio/lib_fgetc.c index 022aed1dcc..15ccb893dd 100644 --- a/libc/stdio/lib_fgetc.c +++ b/libc/stdio/lib_fgetc.c @@ -42,7 +42,7 @@ ****************************************************************************/ #include -#include "lib_internal.h" +#include "libc.h" /**************************************************************************** * Pre-processor Definitions diff --git a/libc/stdio/lib_fgetpos.c b/libc/stdio/lib_fgetpos.c index e2c4d0c696..ea49abb2ce 100644 --- a/libc/stdio/lib_fgetpos.c +++ b/libc/stdio/lib_fgetpos.c @@ -47,7 +47,7 @@ #include #include -#include "lib_internal.h" +#include "libc.h" /**************************************************************************** * Pre-processor Definitions diff --git a/libc/stdio/lib_fgets.c b/libc/stdio/lib_fgets.c index 88dfca3ad1..bce8261e6e 100644 --- a/libc/stdio/lib_fgets.c +++ b/libc/stdio/lib_fgets.c @@ -41,7 +41,7 @@ #include -#include "lib_internal.h" +#include "libc.h" /**************************************************************************** * Pre-processor Definitions diff --git a/libc/stdio/lib_fopen.c b/libc/stdio/lib_fopen.c index 957e439b19..b7208dba5f 100644 --- a/libc/stdio/lib_fopen.c +++ b/libc/stdio/lib_fopen.c @@ -47,7 +47,7 @@ #include #include -#include "lib_internal.h" +#include "libc.h" /**************************************************************************** * Pre-processor Definitions diff --git a/libc/stdio/lib_fputc.c b/libc/stdio/lib_fputc.c index f434d442e2..9ba40a6e7d 100644 --- a/libc/stdio/lib_fputc.c +++ b/libc/stdio/lib_fputc.c @@ -42,7 +42,7 @@ ****************************************************************************/ #include -#include "lib_internal.h" +#include "libc.h" /**************************************************************************** * Pre-processor Definitions diff --git a/libc/stdio/lib_fputs.c b/libc/stdio/lib_fputs.c index a1bcd89c3d..033ff3b9b3 100644 --- a/libc/stdio/lib_fputs.c +++ b/libc/stdio/lib_fputs.c @@ -49,7 +49,7 @@ #include -#include "lib_internal.h" +#include "libc.h" /**************************************************************************** * Pre-processor Definitions diff --git a/libc/stdio/lib_fread.c b/libc/stdio/lib_fread.c index 9c8b2d378a..6acb9d7e77 100644 --- a/libc/stdio/lib_fread.c +++ b/libc/stdio/lib_fread.c @@ -42,7 +42,7 @@ #include #include -#include "lib_internal.h" +#include "libc.h" /**************************************************************************** * Pre-processor Definitions diff --git a/libc/stdio/lib_freopen.c b/libc/stdio/lib_freopen.c index f90546067e..830ea9a78f 100644 --- a/libc/stdio/lib_freopen.c +++ b/libc/stdio/lib_freopen.c @@ -43,7 +43,7 @@ #include #include -#include "lib_internal.h" +#include "libc.h" /**************************************************************************** * Public Functions diff --git a/libc/stdio/lib_fseek.c b/libc/stdio/lib_fseek.c index f09155dc0a..1016d8b37f 100644 --- a/libc/stdio/lib_fseek.c +++ b/libc/stdio/lib_fseek.c @@ -49,7 +49,7 @@ #include #include -#include "lib_internal.h" +#include "libc.h" /**************************************************************************** * Pre-processor Definitions diff --git a/libc/stdio/lib_fsetpos.c b/libc/stdio/lib_fsetpos.c index 71093d4ce8..681aa514f9 100644 --- a/libc/stdio/lib_fsetpos.c +++ b/libc/stdio/lib_fsetpos.c @@ -49,7 +49,7 @@ #include #include -#include "lib_internal.h" +#include "libc.h" /**************************************************************************** * Pre-processor Definitions diff --git a/libc/stdio/lib_ftell.c b/libc/stdio/lib_ftell.c index c72e4e1b85..c13e64c9ae 100644 --- a/libc/stdio/lib_ftell.c +++ b/libc/stdio/lib_ftell.c @@ -49,7 +49,7 @@ #include #include -#include "lib_internal.h" +#include "libc.h" /**************************************************************************** * Pre-processor Definitions diff --git a/libc/stdio/lib_fwrite.c b/libc/stdio/lib_fwrite.c index ed2dce16d8..941120ae6d 100644 --- a/libc/stdio/lib_fwrite.c +++ b/libc/stdio/lib_fwrite.c @@ -42,7 +42,7 @@ #include #include -#include "lib_internal.h" +#include "libc.h" /**************************************************************************** * Pre-processor Definitions diff --git a/libc/stdio/lib_gets.c b/libc/stdio/lib_gets.c index f793fbc445..e8573edca9 100644 --- a/libc/stdio/lib_gets.c +++ b/libc/stdio/lib_gets.c @@ -42,7 +42,7 @@ #include #include -#include "lib_internal.h" +#include "libc.h" /**************************************************************************** * Pre-processor Definitions diff --git a/libc/stdio/lib_gets_s.c b/libc/stdio/lib_gets_s.c index a5a4c50059..d811bdfcfc 100644 --- a/libc/stdio/lib_gets_s.c +++ b/libc/stdio/lib_gets_s.c @@ -42,7 +42,7 @@ #include #include -#include "lib_internal.h" +#include "libc.h" /**************************************************************************** * Pre-processor Definitions diff --git a/libc/stdio/lib_libdtoa.c b/libc/stdio/lib_libdtoa.c index 95a5dcc70b..995b0d72c4 100644 --- a/libc/stdio/lib_libdtoa.c +++ b/libc/stdio/lib_libdtoa.c @@ -46,7 +46,7 @@ #include -#include "lib_internal.h" +#include "libc.h" /**************************************************************************** * Pre-processor Definitions diff --git a/libc/stdio/lib_libfflush.c b/libc/stdio/lib_libfflush.c index ff9aaece4b..4eebac409d 100644 --- a/libc/stdio/lib_libfflush.c +++ b/libc/stdio/lib_libfflush.c @@ -47,7 +47,7 @@ #include -#include "lib_internal.h" +#include "libc.h" /**************************************************************************** * Pre-processor Definitions diff --git a/libc/stdio/lib_libfgets.c b/libc/stdio/lib_libfgets.c index 884cc1f535..4c3c41db05 100644 --- a/libc/stdio/lib_libfgets.c +++ b/libc/stdio/lib_libfgets.c @@ -47,7 +47,7 @@ #include #include -#include "lib_internal.h" +#include "libc.h" /**************************************************************************** * Pre-processor Definitions diff --git a/libc/stdio/lib_libflushall.c b/libc/stdio/lib_libflushall.c index 85e807a9ea..e040d2deb6 100644 --- a/libc/stdio/lib_libflushall.c +++ b/libc/stdio/lib_libflushall.c @@ -45,7 +45,7 @@ #include -#include "lib_internal.h" +#include "libc.h" /**************************************************************************** * Pre-processor Definitions diff --git a/libc/stdio/lib_libfread.c b/libc/stdio/lib_libfread.c index 48ab4ad4cf..e4ad730e26 100644 --- a/libc/stdio/lib_libfread.c +++ b/libc/stdio/lib_libfread.c @@ -46,7 +46,7 @@ #include #include -#include "lib_internal.h" +#include "libc.h" /**************************************************************************** * Pre-processor Definitions diff --git a/libc/stdio/lib_libfwrite.c b/libc/stdio/lib_libfwrite.c index 76c8d72797..12bfd033c8 100644 --- a/libc/stdio/lib_libfwrite.c +++ b/libc/stdio/lib_libfwrite.c @@ -46,7 +46,7 @@ #include #include -#include "lib_internal.h" +#include "libc.h" /**************************************************************************** * Pre-processor Definitions diff --git a/libc/stdio/lib_libnoflush.c b/libc/stdio/lib_libnoflush.c index 63e4d52950..6ad372a653 100644 --- a/libc/stdio/lib_libnoflush.c +++ b/libc/stdio/lib_libnoflush.c @@ -47,7 +47,7 @@ #include #include -#include "lib_internal.h" +#include "libc.h" #ifdef CONFIG_STDIO_LINEBUFFER diff --git a/libc/stdio/lib_libsnoflush.c b/libc/stdio/lib_libsnoflush.c index 1e5af1474b..809356f144 100644 --- a/libc/stdio/lib_libsnoflush.c +++ b/libc/stdio/lib_libsnoflush.c @@ -46,7 +46,7 @@ #include -#include "lib_internal.h" +#include "libc.h" #ifdef CONFIG_STDIO_LINEBUFFER diff --git a/libc/stdio/lib_libsprintf.c b/libc/stdio/lib_libsprintf.c index 1d8abbced7..baa493c7a7 100644 --- a/libc/stdio/lib_libsprintf.c +++ b/libc/stdio/lib_libsprintf.c @@ -38,7 +38,7 @@ ****************************************************************************/ #include -#include "lib_internal.h" +#include "libc.h" /**************************************************************************** * Pre-processor Definitions diff --git a/libc/stdio/lib_libvsprintf.c b/libc/stdio/lib_libvsprintf.c index 634b172ad0..6c1b295811 100644 --- a/libc/stdio/lib_libvsprintf.c +++ b/libc/stdio/lib_libvsprintf.c @@ -46,7 +46,7 @@ #include -#include "lib_internal.h" +#include "libc.h" /**************************************************************************** * Pre-processor Definitions diff --git a/libc/stdio/lib_lowinstream.c b/libc/stdio/lib_lowinstream.c index 8c11fee907..8964b56749 100644 --- a/libc/stdio/lib_lowinstream.c +++ b/libc/stdio/lib_lowinstream.c @@ -45,7 +45,7 @@ #include -#include "lib_internal.h" +#include "libc.h" #ifdef CONFIG_ARCH_LOWGETC diff --git a/libc/stdio/lib_lowoutstream.c b/libc/stdio/lib_lowoutstream.c index f600bc614a..91604c90c4 100644 --- a/libc/stdio/lib_lowoutstream.c +++ b/libc/stdio/lib_lowoutstream.c @@ -46,7 +46,7 @@ #include #include -#include "lib_internal.h" +#include "libc.h" /**************************************************************************** * Private Functions diff --git a/libc/stdio/lib_meminstream.c b/libc/stdio/lib_meminstream.c index 195b294e4d..c975419499 100644 --- a/libc/stdio/lib_meminstream.c +++ b/libc/stdio/lib_meminstream.c @@ -39,7 +39,7 @@ #include -#include "lib_internal.h" +#include "libc.h" /**************************************************************************** * Private Functions diff --git a/libc/stdio/lib_memoutstream.c b/libc/stdio/lib_memoutstream.c index 492661e68a..1c658512ea 100644 --- a/libc/stdio/lib_memoutstream.c +++ b/libc/stdio/lib_memoutstream.c @@ -39,7 +39,7 @@ #include -#include "lib_internal.h" +#include "libc.h" /**************************************************************************** * Private Functions diff --git a/libc/stdio/lib_memsistream.c b/libc/stdio/lib_memsistream.c index d258c7fde1..af241b4c2e 100644 --- a/libc/stdio/lib_memsistream.c +++ b/libc/stdio/lib_memsistream.c @@ -39,7 +39,7 @@ #include -#include "lib_internal.h" +#include "libc.h" /**************************************************************************** * Private Functions diff --git a/libc/stdio/lib_memsostream.c b/libc/stdio/lib_memsostream.c index 8726ea187e..6570ef8942 100644 --- a/libc/stdio/lib_memsostream.c +++ b/libc/stdio/lib_memsostream.c @@ -39,7 +39,7 @@ #include -#include "lib_internal.h" +#include "libc.h" /**************************************************************************** * Private Functions diff --git a/libc/stdio/lib_nullinstream.c b/libc/stdio/lib_nullinstream.c index aeb0af3790..9ca50d6379 100644 --- a/libc/stdio/lib_nullinstream.c +++ b/libc/stdio/lib_nullinstream.c @@ -40,7 +40,7 @@ #include #include -#include "lib_internal.h" +#include "libc.h" /**************************************************************************** * Private Functions diff --git a/libc/stdio/lib_nulloutstream.c b/libc/stdio/lib_nulloutstream.c index 5742953448..89a5a2524d 100644 --- a/libc/stdio/lib_nulloutstream.c +++ b/libc/stdio/lib_nulloutstream.c @@ -41,7 +41,7 @@ #include #include -#include "lib_internal.h" +#include "libc.h" /**************************************************************************** * Private Functions diff --git a/libc/stdio/lib_printf.c b/libc/stdio/lib_printf.c index b38257f230..f4289c9b57 100644 --- a/libc/stdio/lib_printf.c +++ b/libc/stdio/lib_printf.c @@ -44,7 +44,7 @@ #include #include -#include "lib_internal.h" +#include "libc.h" /**************************************************************************** * Pre-processor Definitions diff --git a/libc/stdio/lib_puts.c b/libc/stdio/lib_puts.c index 4d2ab4c4ed..c30c92aaf4 100644 --- a/libc/stdio/lib_puts.c +++ b/libc/stdio/lib_puts.c @@ -42,7 +42,7 @@ ****************************************************************************/ #include -#include "lib_internal.h" +#include "libc.h" /**************************************************************************** * Pre-processor Definitions diff --git a/libc/stdio/lib_rawinstream.c b/libc/stdio/lib_rawinstream.c index 19a980787d..913a413bff 100644 --- a/libc/stdio/lib_rawinstream.c +++ b/libc/stdio/lib_rawinstream.c @@ -41,7 +41,7 @@ #include #include -#include "lib_internal.h" +#include "libc.h" /**************************************************************************** * Private Functions diff --git a/libc/stdio/lib_rawoutstream.c b/libc/stdio/lib_rawoutstream.c index 7f2c522474..aed1fc5272 100644 --- a/libc/stdio/lib_rawoutstream.c +++ b/libc/stdio/lib_rawoutstream.c @@ -41,7 +41,7 @@ #include #include -#include "lib_internal.h" +#include "libc.h" /**************************************************************************** * Private Functions diff --git a/libc/stdio/lib_rawsistream.c b/libc/stdio/lib_rawsistream.c index b013e43a80..d52fad1daf 100644 --- a/libc/stdio/lib_rawsistream.c +++ b/libc/stdio/lib_rawsistream.c @@ -41,7 +41,7 @@ #include #include -#include "lib_internal.h" +#include "libc.h" /**************************************************************************** * Private Functions diff --git a/libc/stdio/lib_rawsostream.c b/libc/stdio/lib_rawsostream.c index 82db850f78..3c0b96dfa8 100644 --- a/libc/stdio/lib_rawsostream.c +++ b/libc/stdio/lib_rawsostream.c @@ -41,7 +41,7 @@ #include #include -#include "lib_internal.h" +#include "libc.h" /**************************************************************************** * Private Functions diff --git a/libc/stdio/lib_rdflush.c b/libc/stdio/lib_rdflush.c index 65d37ac356..27bd25f6fd 100644 --- a/libc/stdio/lib_rdflush.c +++ b/libc/stdio/lib_rdflush.c @@ -48,7 +48,7 @@ #include #include -#include "lib_internal.h" +#include "libc.h" /**************************************************************************** * Pre-processor Definitions diff --git a/libc/stdio/lib_snprintf.c b/libc/stdio/lib_snprintf.c index 63d0b2a5df..53e9a2cbcc 100644 --- a/libc/stdio/lib_snprintf.c +++ b/libc/stdio/lib_snprintf.c @@ -42,7 +42,7 @@ #include #include -#include "lib_internal.h" +#include "libc.h" /**************************************************************************** * Pre-processor Definitions diff --git a/libc/stdio/lib_sprintf.c b/libc/stdio/lib_sprintf.c index a0b3321bb1..5420e1e539 100644 --- a/libc/stdio/lib_sprintf.c +++ b/libc/stdio/lib_sprintf.c @@ -38,7 +38,7 @@ ****************************************************************************/ #include -#include "lib_internal.h" +#include "libc.h" /**************************************************************************** * Pre-processor Definitions diff --git a/libc/stdio/lib_stdinstream.c b/libc/stdio/lib_stdinstream.c index 240763613f..f1b5f3da99 100644 --- a/libc/stdio/lib_stdinstream.c +++ b/libc/stdio/lib_stdinstream.c @@ -39,7 +39,7 @@ #include -#include "lib_internal.h" +#include "libc.h" /**************************************************************************** * Private Functions diff --git a/libc/stdio/lib_stdoutstream.c b/libc/stdio/lib_stdoutstream.c index 73321c7fdb..b30e815160 100644 --- a/libc/stdio/lib_stdoutstream.c +++ b/libc/stdio/lib_stdoutstream.c @@ -41,7 +41,7 @@ #include #include -#include "lib_internal.h" +#include "libc.h" /**************************************************************************** * Private Functions diff --git a/libc/stdio/lib_stdsistream.c b/libc/stdio/lib_stdsistream.c index 0999f85132..b569bb4122 100644 --- a/libc/stdio/lib_stdsistream.c +++ b/libc/stdio/lib_stdsistream.c @@ -39,7 +39,7 @@ #include -#include "lib_internal.h" +#include "libc.h" /**************************************************************************** * Private Functions diff --git a/libc/stdio/lib_stdsostream.c b/libc/stdio/lib_stdsostream.c index ade6369c51..4e196b1a22 100644 --- a/libc/stdio/lib_stdsostream.c +++ b/libc/stdio/lib_stdsostream.c @@ -41,7 +41,7 @@ #include #include -#include "lib_internal.h" +#include "libc.h" /**************************************************************************** * Private Functions diff --git a/libc/stdio/lib_ungetc.c b/libc/stdio/lib_ungetc.c index c8baf9a266..4ae4bc69b1 100644 --- a/libc/stdio/lib_ungetc.c +++ b/libc/stdio/lib_ungetc.c @@ -46,7 +46,7 @@ #include #include #include -#include "lib_internal.h" +#include "libc.h" /**************************************************************************** * Pre-processor Definitions diff --git a/libc/stdio/lib_vasprintf.c b/libc/stdio/lib_vasprintf.c index f7b2402712..53e0a15706 100644 --- a/libc/stdio/lib_vasprintf.c +++ b/libc/stdio/lib_vasprintf.c @@ -42,7 +42,7 @@ #include #include -#include "lib_internal.h" +#include "libc.h" /**************************************************************************** * Pre-processor Definitions diff --git a/libc/stdio/lib_vdprintf.c b/libc/stdio/lib_vdprintf.c index d96ca40f88..26959b5de8 100644 --- a/libc/stdio/lib_vdprintf.c +++ b/libc/stdio/lib_vdprintf.c @@ -42,7 +42,7 @@ #include -#include "lib_internal.h" +#include "libc.h" /**************************************************************************** * Public Functions diff --git a/libc/stdio/lib_vfprintf.c b/libc/stdio/lib_vfprintf.c index 8681b2151d..328fc42f82 100644 --- a/libc/stdio/lib_vfprintf.c +++ b/libc/stdio/lib_vfprintf.c @@ -42,7 +42,7 @@ #include #include -#include "lib_internal.h" +#include "libc.h" /**************************************************************************** * Pre-processor Definitions diff --git a/libc/stdio/lib_vsnprintf.c b/libc/stdio/lib_vsnprintf.c index 5fd300f7fe..ad329e173e 100644 --- a/libc/stdio/lib_vsnprintf.c +++ b/libc/stdio/lib_vsnprintf.c @@ -42,7 +42,7 @@ #include #include -#include "lib_internal.h" +#include "libc.h" /**************************************************************************** * Pre-processor Definitions diff --git a/libc/stdio/lib_vsprintf.c b/libc/stdio/lib_vsprintf.c index 57589cef56..0ad85086bf 100644 --- a/libc/stdio/lib_vsprintf.c +++ b/libc/stdio/lib_vsprintf.c @@ -41,7 +41,7 @@ #include -#include "lib_internal.h" +#include "libc.h" /**************************************************************************** * Pre-processor Definitions diff --git a/libc/stdio/lib_wrflush.c b/libc/stdio/lib_wrflush.c index 0587e417eb..0ccd007c6b 100644 --- a/libc/stdio/lib_wrflush.c +++ b/libc/stdio/lib_wrflush.c @@ -43,7 +43,7 @@ #include #include -#include "lib_internal.h" +#include "libc.h" /**************************************************************************** * Pre-processor Definitions diff --git a/libc/stdio/lib_zeroinstream.c b/libc/stdio/lib_zeroinstream.c index a52ecc1d06..506d005871 100644 --- a/libc/stdio/lib_zeroinstream.c +++ b/libc/stdio/lib_zeroinstream.c @@ -39,7 +39,7 @@ #include #include -#include "lib_internal.h" +#include "libc.h" /**************************************************************************** * Private Functions diff --git a/libc/stdlib/lib_checkbase.c b/libc/stdlib/lib_checkbase.c index 83199bcfae..05abe7b896 100644 --- a/libc/stdlib/lib_checkbase.c +++ b/libc/stdlib/lib_checkbase.c @@ -42,7 +42,7 @@ #include #include -#include "lib_internal.h" +#include "libc.h" /**************************************************************************** * Private Functions diff --git a/libc/stdlib/lib_strtol.c b/libc/stdlib/lib_strtol.c index 5518172949..8c7f639901 100644 --- a/libc/stdlib/lib_strtol.c +++ b/libc/stdlib/lib_strtol.c @@ -42,7 +42,7 @@ #include #include -#include "lib_internal.h" +#include "libc.h" /**************************************************************************** * Private Functions diff --git a/libc/stdlib/lib_strtoll.c b/libc/stdlib/lib_strtoll.c index 7ed5ecab20..bc8cc2eb6f 100644 --- a/libc/stdlib/lib_strtoll.c +++ b/libc/stdlib/lib_strtoll.c @@ -42,7 +42,7 @@ #include #include -#include "lib_internal.h" +#include "libc.h" #ifdef CONFIG_HAVE_LONG_LONG diff --git a/libc/stdlib/lib_strtoul.c b/libc/stdlib/lib_strtoul.c index 712a658e26..3dfe5a5e60 100644 --- a/libc/stdlib/lib_strtoul.c +++ b/libc/stdlib/lib_strtoul.c @@ -41,7 +41,7 @@ #include -#include "lib_internal.h" +#include "libc.h" /**************************************************************************** * Private Functions diff --git a/libc/stdlib/lib_strtoull.c b/libc/stdlib/lib_strtoull.c index 169058128a..82adc0450a 100644 --- a/libc/stdlib/lib_strtoull.c +++ b/libc/stdlib/lib_strtoull.c @@ -42,7 +42,7 @@ #include -#include "lib_internal.h" +#include "libc.h" #ifdef CONFIG_HAVE_LONG_LONG diff --git a/libc/string/lib_isbasedigit.c b/libc/string/lib_isbasedigit.c index dff8138811..e72e33de5c 100644 --- a/libc/string/lib_isbasedigit.c +++ b/libc/string/lib_isbasedigit.c @@ -43,7 +43,7 @@ #include #include -#include "lib_internal.h" +#include "libc.h" /**************************************************************************** * Private Functions diff --git a/libc/string/lib_skipspace.c b/libc/string/lib_skipspace.c index 4b72b1ec37..602c03a274 100644 --- a/libc/string/lib_skipspace.c +++ b/libc/string/lib_skipspace.c @@ -41,7 +41,7 @@ #include #include -#include "lib_internal.h" +#include "libc.h" /**************************************************************************** * Private Functions diff --git a/libc/string/lib_strdup.c b/libc/string/lib_strdup.c index ab5c620a12..4da233d163 100644 --- a/libc/string/lib_strdup.c +++ b/libc/string/lib_strdup.c @@ -41,7 +41,7 @@ #include -#include "lib_internal.h" +#include "libc.h" /**************************************************************************** * Public Functions diff --git a/libc/string/lib_strndup.c b/libc/string/lib_strndup.c index 984b363944..1c097de81a 100644 --- a/libc/string/lib_strndup.c +++ b/libc/string/lib_strndup.c @@ -41,7 +41,7 @@ #include -#include "lib_internal.h" +#include "libc.h" /**************************************************************************** * Public Functions diff --git a/libc/unistd/lib_chdir.c b/libc/unistd/lib_chdir.c index 87353b546d..4780a6b72e 100644 --- a/libc/unistd/lib_chdir.c +++ b/libc/unistd/lib_chdir.c @@ -45,7 +45,7 @@ #include #include -#include "lib_internal.h" +#include "libc.h" #if CONFIG_NFILE_DESCRIPTORS > 0 && !defined(CONFIG_DISABLE_ENVIRON) diff --git a/libc/unistd/lib_getcwd.c b/libc/unistd/lib_getcwd.c index 9a25399996..851d380fb6 100644 --- a/libc/unistd/lib_getcwd.c +++ b/libc/unistd/lib_getcwd.c @@ -45,7 +45,7 @@ #include #include -#include "lib_internal.h" +#include "libc.h" #if CONFIG_NFILE_DESCRIPTORS > 0 && !defined(CONFIG_DISABLE_ENVIRON) diff --git a/libnx/nxfonts/nxfonts_internal.h b/libnx/nxfonts/nxfonts.h similarity index 94% rename from libnx/nxfonts/nxfonts_internal.h rename to libnx/nxfonts/nxfonts.h index 7fccd5ab4e..1e3fa18bb3 100644 --- a/libnx/nxfonts/nxfonts_internal.h +++ b/libnx/nxfonts/nxfonts.h @@ -1,5 +1,5 @@ /**************************************************************************** - * libnx/nxfonts/nxfonts_internal.h + * libnx/nxfonts/nxfonts.h * * Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __LIBNX_NXFONTS_NXFONTS_INTERNAL_H -#define __LIBNX_NXFONTS_NXFONTS_INTERNAL_H +#ifndef __LIBNX_NXFONTS_NXFONTS_H +#define __LIBNX_NXFONTS_NXFONTS_H /**************************************************************************** * Included Files @@ -85,4 +85,4 @@ EXTERN struct nx_font_s g_fonts; } #endif -#endif /* __LIBNX_NXFONTS_NXFONTS_INTERNAL_H */ +#endif /* __LIBNX_NXFONTS_NXFONTS_H */ diff --git a/libnx/nxfonts/nxfonts_bitmaps.c b/libnx/nxfonts/nxfonts_bitmaps.c index 0a71faacfe..28e6aa18dc 100644 --- a/libnx/nxfonts/nxfonts_bitmaps.c +++ b/libnx/nxfonts/nxfonts_bitmaps.c @@ -42,7 +42,7 @@ #include #include -#include "nxfonts_internal.h" +#include "nxfonts.h" /* Pick the fontset */ diff --git a/libnx/nxfonts/nxfonts_convert.c b/libnx/nxfonts/nxfonts_convert.c index a223c7f0a9..6d3b5a71e2 100644 --- a/libnx/nxfonts/nxfonts_convert.c +++ b/libnx/nxfonts/nxfonts_convert.c @@ -46,7 +46,7 @@ #include #include -#include "nxfonts_internal.h" +#include "nxfonts.h" /**************************************************************************** * Pre-Processor Definitions diff --git a/libnx/nxfonts/nxfonts_getfont.c b/libnx/nxfonts/nxfonts_getfont.c index fe443138df..c52c082281 100644 --- a/libnx/nxfonts/nxfonts_getfont.c +++ b/libnx/nxfonts/nxfonts_getfont.c @@ -46,7 +46,7 @@ #include #include -#include "nxfonts_internal.h" +#include "nxfonts.h" /**************************************************************************** * Pre-Processor Definitions diff --git a/libnx/nxtk/nxtk_internal.h b/libnx/nxtk/nxtk.h similarity index 98% rename from libnx/nxtk/nxtk_internal.h rename to libnx/nxtk/nxtk.h index 7a62293413..44d507ee01 100644 --- a/libnx/nxtk/nxtk_internal.h +++ b/libnx/nxtk/nxtk.h @@ -1,5 +1,5 @@ /**************************************************************************** - * libnx/nxtk/nxtk_internal.h + * libnx/nxtk/nxtk.h * * Copyright (C) 2008-2009, 2011-2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __LIBNX_NXTK_NXTK_INTERNAL_H -#define __LIBNX_NXTK_NXTK_INTERNAL_H +#ifndef __LIBNX_NXTK_NXTK_H +#define __LIBNX_NXTK_NXTK_H /**************************************************************************** * Included Files @@ -222,4 +222,4 @@ int nxtk_drawframe(FAR struct nxtk_framedwindow_s *fwnd, } #endif -#endif /* __LIBNX_NXTK_NXTK_INTERNAL_H */ +#endif /* __LIBNX_NXTK_NXTK_H */ diff --git a/libnx/nxtk/nxtk_bitmaptoolbar.c b/libnx/nxtk/nxtk_bitmaptoolbar.c index abeb14d184..abc1815b8f 100644 --- a/libnx/nxtk/nxtk_bitmaptoolbar.c +++ b/libnx/nxtk/nxtk_bitmaptoolbar.c @@ -46,7 +46,7 @@ #include #include -#include "nxtk_internal.h" +#include "nxtk.h" /**************************************************************************** * Pre-Processor Definitions diff --git a/libnx/nxtk/nxtk_bitmapwindow.c b/libnx/nxtk/nxtk_bitmapwindow.c index da814fe10a..59a8776b62 100644 --- a/libnx/nxtk/nxtk_bitmapwindow.c +++ b/libnx/nxtk/nxtk_bitmapwindow.c @@ -46,7 +46,7 @@ #include #include -#include "nxtk_internal.h" +#include "nxtk.h" /**************************************************************************** * Pre-Processor Definitions diff --git a/libnx/nxtk/nxtk_closetoolbar.c b/libnx/nxtk/nxtk_closetoolbar.c index 8f65a75a84..7be217d18d 100644 --- a/libnx/nxtk/nxtk_closetoolbar.c +++ b/libnx/nxtk/nxtk_closetoolbar.c @@ -46,7 +46,7 @@ #include #include -#include "nxtk_internal.h" +#include "nxtk.h" /**************************************************************************** * Pre-Processor Definitions diff --git a/libnx/nxtk/nxtk_closewindow.c b/libnx/nxtk/nxtk_closewindow.c index 7bda3ff06b..5485752130 100644 --- a/libnx/nxtk/nxtk_closewindow.c +++ b/libnx/nxtk/nxtk_closewindow.c @@ -47,7 +47,7 @@ #include #include -#include "nxtk_internal.h" +#include "nxtk.h" /**************************************************************************** * Pre-Processor Definitions diff --git a/libnx/nxtk/nxtk_containerclip.c b/libnx/nxtk/nxtk_containerclip.c index 12dc4987b3..67ed6cb17b 100644 --- a/libnx/nxtk/nxtk_containerclip.c +++ b/libnx/nxtk/nxtk_containerclip.c @@ -46,7 +46,7 @@ #include #include -#include "nxtk_internal.h" +#include "nxtk.h" /**************************************************************************** * Pre-Processor Definitions diff --git a/libnx/nxtk/nxtk_drawframe.c b/libnx/nxtk/nxtk_drawframe.c index ae0be64425..adafccc574 100644 --- a/libnx/nxtk/nxtk_drawframe.c +++ b/libnx/nxtk/nxtk_drawframe.c @@ -47,7 +47,7 @@ #include #include -#include "nxtk_internal.h" +#include "nxtk.h" /**************************************************************************** * Pre-Processor Definitions diff --git a/libnx/nxtk/nxtk_events.c b/libnx/nxtk/nxtk_events.c index 33d496e19a..d7f33e6ebe 100644 --- a/libnx/nxtk/nxtk_events.c +++ b/libnx/nxtk/nxtk_events.c @@ -48,7 +48,7 @@ #include #include -#include "nxtk_internal.h" +#include "nxtk.h" /**************************************************************************** * Pre-processor Definitions diff --git a/libnx/nxtk/nxtk_filltoolbar.c b/libnx/nxtk/nxtk_filltoolbar.c index 13de372498..0d62eaaf84 100644 --- a/libnx/nxtk/nxtk_filltoolbar.c +++ b/libnx/nxtk/nxtk_filltoolbar.c @@ -46,7 +46,7 @@ #include #include -#include "nxtk_internal.h" +#include "nxtk.h" /**************************************************************************** * Pre-Processor Definitions diff --git a/libnx/nxtk/nxtk_filltraptoolbar.c b/libnx/nxtk/nxtk_filltraptoolbar.c index a55d05e7e9..1b7ae27277 100644 --- a/libnx/nxtk/nxtk_filltraptoolbar.c +++ b/libnx/nxtk/nxtk_filltraptoolbar.c @@ -46,7 +46,7 @@ #include #include -#include "nxtk_internal.h" +#include "nxtk.h" /**************************************************************************** * Pre-Processor Definitions diff --git a/libnx/nxtk/nxtk_filltrapwindow.c b/libnx/nxtk/nxtk_filltrapwindow.c index 66aef4184f..bbfba26599 100644 --- a/libnx/nxtk/nxtk_filltrapwindow.c +++ b/libnx/nxtk/nxtk_filltrapwindow.c @@ -46,7 +46,7 @@ #include #include -#include "nxtk_internal.h" +#include "nxtk.h" /**************************************************************************** * Pre-Processor Definitions diff --git a/libnx/nxtk/nxtk_fillwindow.c b/libnx/nxtk/nxtk_fillwindow.c index 77f043391c..fa0fd8d8f2 100644 --- a/libnx/nxtk/nxtk_fillwindow.c +++ b/libnx/nxtk/nxtk_fillwindow.c @@ -46,7 +46,7 @@ #include #include -#include "nxtk_internal.h" +#include "nxtk.h" /**************************************************************************** * Pre-Processor Definitions diff --git a/libnx/nxtk/nxtk_getposition.c b/libnx/nxtk/nxtk_getposition.c index a0b21bedba..1f0bdceeef 100644 --- a/libnx/nxtk/nxtk_getposition.c +++ b/libnx/nxtk/nxtk_getposition.c @@ -46,7 +46,7 @@ #include #include -#include "nxtk_internal.h" +#include "nxtk.h" /**************************************************************************** * Pre-Processor Definitions diff --git a/libnx/nxtk/nxtk_gettoolbar.c b/libnx/nxtk/nxtk_gettoolbar.c index a83a1aa3e6..593fcb09a6 100644 --- a/libnx/nxtk/nxtk_gettoolbar.c +++ b/libnx/nxtk/nxtk_gettoolbar.c @@ -46,7 +46,7 @@ #include #include -#include "nxtk_internal.h" +#include "nxtk.h" /**************************************************************************** * Pre-Processor Definitions diff --git a/libnx/nxtk/nxtk_getwindow.c b/libnx/nxtk/nxtk_getwindow.c index a91ad05fc6..b229459973 100644 --- a/libnx/nxtk/nxtk_getwindow.c +++ b/libnx/nxtk/nxtk_getwindow.c @@ -46,7 +46,7 @@ #include #include -#include "nxtk_internal.h" +#include "nxtk.h" /**************************************************************************** * Pre-Processor Definitions diff --git a/libnx/nxtk/nxtk_lower.c b/libnx/nxtk/nxtk_lower.c index de26ac509b..08a588897d 100644 --- a/libnx/nxtk/nxtk_lower.c +++ b/libnx/nxtk/nxtk_lower.c @@ -46,7 +46,7 @@ #include #include -#include "nxtk_internal.h" +#include "nxtk.h" /**************************************************************************** * Pre-Processor Definitions diff --git a/libnx/nxtk/nxtk_movetoolbar.c b/libnx/nxtk/nxtk_movetoolbar.c index 275bb46e66..62d14e7bf8 100644 --- a/libnx/nxtk/nxtk_movetoolbar.c +++ b/libnx/nxtk/nxtk_movetoolbar.c @@ -46,7 +46,7 @@ #include #include -#include "nxtk_internal.h" +#include "nxtk.h" /**************************************************************************** * Pre-Processor Definitions diff --git a/libnx/nxtk/nxtk_movewindow.c b/libnx/nxtk/nxtk_movewindow.c index 66aed9d16a..2b34f44a8b 100644 --- a/libnx/nxtk/nxtk_movewindow.c +++ b/libnx/nxtk/nxtk_movewindow.c @@ -46,7 +46,7 @@ #include #include -#include "nxtk_internal.h" +#include "nxtk.h" /**************************************************************************** * Pre-Processor Definitions diff --git a/libnx/nxtk/nxtk_opentoolbar.c b/libnx/nxtk/nxtk_opentoolbar.c index ffdf629013..26aa4c504f 100644 --- a/libnx/nxtk/nxtk_opentoolbar.c +++ b/libnx/nxtk/nxtk_opentoolbar.c @@ -46,7 +46,7 @@ #include #include -#include "nxtk_internal.h" +#include "nxtk.h" /**************************************************************************** * Pre-Processor Definitions diff --git a/libnx/nxtk/nxtk_openwindow.c b/libnx/nxtk/nxtk_openwindow.c index c7c050b8da..796a57d3b7 100644 --- a/libnx/nxtk/nxtk_openwindow.c +++ b/libnx/nxtk/nxtk_openwindow.c @@ -46,7 +46,7 @@ #include #include "nxcontext.h" -#include "nxtk_internal.h" +#include "nxtk.h" /**************************************************************************** * Pre-Processor Definitions diff --git a/libnx/nxtk/nxtk_raise.c b/libnx/nxtk/nxtk_raise.c index 2b54f81cb6..d0273fe704 100644 --- a/libnx/nxtk/nxtk_raise.c +++ b/libnx/nxtk/nxtk_raise.c @@ -46,7 +46,7 @@ #include #include -#include "nxtk_internal.h" +#include "nxtk.h" /**************************************************************************** * Pre-Processor Definitions diff --git a/libnx/nxtk/nxtk_setposition.c b/libnx/nxtk/nxtk_setposition.c index f3ba118726..ed85625272 100644 --- a/libnx/nxtk/nxtk_setposition.c +++ b/libnx/nxtk/nxtk_setposition.c @@ -46,7 +46,7 @@ #include #include -#include "nxtk_internal.h" +#include "nxtk.h" /**************************************************************************** * Pre-Processor Definitions diff --git a/libnx/nxtk/nxtk_setsize.c b/libnx/nxtk/nxtk_setsize.c index 671aa80540..8848c71720 100644 --- a/libnx/nxtk/nxtk_setsize.c +++ b/libnx/nxtk/nxtk_setsize.c @@ -46,7 +46,7 @@ #include #include -#include "nxtk_internal.h" +#include "nxtk.h" /**************************************************************************** * Pre-Processor Definitions diff --git a/libnx/nxtk/nxtk_setsubwindows.c b/libnx/nxtk/nxtk_setsubwindows.c index 5ebd5f2be7..943825a8b0 100644 --- a/libnx/nxtk/nxtk_setsubwindows.c +++ b/libnx/nxtk/nxtk_setsubwindows.c @@ -45,7 +45,7 @@ #include #include -#include "nxtk_internal.h" +#include "nxtk.h" /**************************************************************************** * Pre-processor Definitions diff --git a/libnx/nxtk/nxtk_subwindowclip.c b/libnx/nxtk/nxtk_subwindowclip.c index b2688a543d..b1b4024ee7 100644 --- a/libnx/nxtk/nxtk_subwindowclip.c +++ b/libnx/nxtk/nxtk_subwindowclip.c @@ -46,7 +46,7 @@ #include #include -#include "nxtk_internal.h" +#include "nxtk.h" /**************************************************************************** * Pre-Processor Definitions diff --git a/libnx/nxtk/nxtk_subwindowmove.c b/libnx/nxtk/nxtk_subwindowmove.c index 6ae737b580..6b80609d3d 100644 --- a/libnx/nxtk/nxtk_subwindowmove.c +++ b/libnx/nxtk/nxtk_subwindowmove.c @@ -46,7 +46,7 @@ #include #include -#include "nxtk_internal.h" +#include "nxtk.h" /**************************************************************************** * Pre-Processor Definitions diff --git a/libnx/nxtk/nxtk_toolbarbounds.c b/libnx/nxtk/nxtk_toolbarbounds.c index 6303b4d20d..eacaf90573 100644 --- a/libnx/nxtk/nxtk_toolbarbounds.c +++ b/libnx/nxtk/nxtk_toolbarbounds.c @@ -45,7 +45,7 @@ #include #include -#include "nxtk_internal.h" +#include "nxtk.h" /**************************************************************************** * Pre-Processor Definitions