diff options
| author | Bernard Xiong <[email protected]> | 2018-10-25 21:42:47 +0800 |
|---|---|---|
| committer | Bernard Xiong <[email protected]> | 2018-10-25 21:42:47 +0800 |
| commit | d23a65d54ec519b0b1bb844d3b2758b2253d4ff7 (patch) | |
| tree | 2b7494b3a2f4832306828498210741d3606411bb /components/net/sal_socket/impl | |
| parent | 4660882320f8ac3499f74c30dcbaf8f2b40c202f (diff) | |
| parent | 8483a50d8df8bf652c71d74d678bea48c48cfc92 (diff) | |
Merge branch 'master' into dev-4.0.x
Diffstat (limited to 'components/net/sal_socket/impl')
| -rw-r--r-- | components/net/sal_socket/impl/af_inet.h | 18 | ||||
| -rw-r--r-- | components/net/sal_socket/impl/af_inet_at.c | 22 | ||||
| -rw-r--r-- | components/net/sal_socket/impl/af_inet_lwip.c | 22 |
3 files changed, 14 insertions, 48 deletions
diff --git a/components/net/sal_socket/impl/af_inet.h b/components/net/sal_socket/impl/af_inet.h index 8d6be25eaa..8b7bf9d2a6 100644 --- a/components/net/sal_socket/impl/af_inet.h +++ b/components/net/sal_socket/impl/af_inet.h @@ -1,21 +1,7 @@ /* - * File : af_inet.h - * This file is part of RT-Thread RTOS - * COPYRIGHT (C) 2006 - 2018, RT-Thread Development Team + * Copyright (c) 2006-2018, RT-Thread Development Team * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * SPDX-License-Identifier: Apache-2.0 * * Change Logs: * Date Author Notes diff --git a/components/net/sal_socket/impl/af_inet_at.c b/components/net/sal_socket/impl/af_inet_at.c index f921e721eb..c064283a61 100644 --- a/components/net/sal_socket/impl/af_inet_at.c +++ b/components/net/sal_socket/impl/af_inet_at.c @@ -1,21 +1,7 @@ /* - * File : af_inet_at.c - * This file is part of RT-Thread RTOS - * COPYRIGHT (C) 2006 - 2018, RT-Thread Development Team + * Copyright (c) 2006-2018, RT-Thread Development Team * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * SPDX-License-Identifier: Apache-2.0 * * Change Logs: * Date Author Notes @@ -34,6 +20,8 @@ #include <dfs_poll.h> #endif +#ifdef SAL_USING_AT + #ifdef SAL_USING_POSIX static int at_poll(struct dfs_fd *file, struct rt_pollreq *req) { @@ -125,3 +113,5 @@ int at_inet_init(void) return 0; } INIT_COMPONENT_EXPORT(at_inet_init); + +#endif /* SAL_USING_AT */ diff --git a/components/net/sal_socket/impl/af_inet_lwip.c b/components/net/sal_socket/impl/af_inet_lwip.c index 563f8947d0..41ea9ac968 100644 --- a/components/net/sal_socket/impl/af_inet_lwip.c +++ b/components/net/sal_socket/impl/af_inet_lwip.c @@ -1,21 +1,7 @@ /* - * File : af_inet_lwip.c - * This file is part of RT-Thread RTOS - * COPYRIGHT (C) 2006 - 2018, RT-Thread Development Team + * Copyright (c) 2006-2018, RT-Thread Development Team * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * SPDX-License-Identifier: Apache-2.0 * * Change Logs: * Date Author Notes @@ -44,6 +30,8 @@ #endif #endif +#ifdef SAL_USING_LWIP + #ifdef SAL_USING_POSIX /* * Re-define lwip socket @@ -307,3 +295,5 @@ int lwip_inet_init(void) return 0; } INIT_COMPONENT_EXPORT(lwip_inet_init); + +#endif /* SAL_USING_LWIP */ |
