Move apps/include/builtin.h to apps/include/builtin/builtin.h

This commit is contained in:
Gregory Nutt 2016-07-01 07:08:03 -06:00
parent 0f1e86b2fd
commit f48a813e0e
4 changed files with 8 additions and 37 deletions

@ -61,7 +61,7 @@ collected during the make context build phase.
To execute an application function: To execute an application function:
exec_builtin() is defined in the nuttx/include/apps/builtin.h exec_builtin() is defined in the nuttx/include/apps/builtin/builtin.h
NuttShell (NSH) Built-In Commands NuttShell (NSH) Built-In Commands
--------------------------------- ---------------------------------

@ -51,36 +51,7 @@
#include <errno.h> #include <errno.h>
#include <debug.h> #include <debug.h>
#if 0 #include <apps/builtin/builtin.h>
#include <sys/wait.h>
#include <sched.h>
#include <string.h>
#include <semaphore.h>
#include <nuttx/binfmt/builtin.h>
#endif
#include <apps/builtin.h>
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
/****************************************************************************
* Private Types
****************************************************************************/
/****************************************************************************
* Private Function Prototypes
****************************************************************************/
/****************************************************************************
* Private Data
****************************************************************************/
/****************************************************************************
* Private Functions
****************************************************************************/
/**************************************************************************** /****************************************************************************
* Public Functions * Public Functions

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* apps/include/builtin.h * apps/include/builtin/builtin.h
* *
* Originally by: * Originally by:
* *
@ -8,7 +8,7 @@
* *
* With subsequent updates, modifications, and general maintenance by: * With subsequent updates, modifications, and general maintenance by:
* *
* Copyright (C) 2012-2013, 2015 Gregory Nutt. All rights reserved. * Copyright (C) 2012-2013, 2015-2016 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -40,8 +40,8 @@
* *
****************************************************************************/ ****************************************************************************/
#ifndef __APPS_INCLUDE_BUILTIN_H #ifndef __APPS_INCLUDE_BUILTIN_BUILTIN_H
#define __APPS_INCLUDE_BUILTIN_H #define __APPS_INCLUDE_BUILTIN_BUILTIN_H
/**************************************************************************** /****************************************************************************
* Included Files * Included Files
@ -109,4 +109,4 @@ int exec_builtin(FAR const char *appname, FAR char * const *argv,
} }
#endif #endif
#endif /* __APPS_INCLUDE_BUILTIN_H */ #endif /* __APPS_INCLUDE_BUILTIN_BUILTIN_H */

@ -55,7 +55,7 @@
#include <string.h> #include <string.h>
#include <nuttx/binfmt/builtin.h> #include <nuttx/binfmt/builtin.h>
#include <apps/builtin.h> #include <apps/builtin/builtin.h>
#include "nsh.h" #include "nsh.h"
#include "nsh_console.h" #include "nsh_console.h"