mirror of
https://github.com/elua/elua.git
synced 2025-01-25 01:02:54 +08:00
eLua - Disambiguate duplicate serial.h
(renaming fixes name overlap with serial.h in SAM drivers)
This commit is contained in:
parent
18c72d0f39
commit
f38162e92e
@ -1,6 +1,7 @@
|
|||||||
#include "cexcept.h"
|
#include "cexcept.h"
|
||||||
#include "type.h"
|
#include "type.h"
|
||||||
#include "serial.h"
|
#include "rpc_serial.h"
|
||||||
|
#warning Not sure which of the two serial.h this should include
|
||||||
|
|
||||||
/****************************************************************************/
|
/****************************************************************************/
|
||||||
// Parameters
|
// Parameters
|
||||||
|
@ -10,7 +10,7 @@
|
|||||||
#include "config.h"
|
#include "config.h"
|
||||||
#include "log.h"
|
#include "log.h"
|
||||||
#include "type.h"
|
#include "type.h"
|
||||||
#include "serial.h"
|
#include "rfs_serial.h"
|
||||||
#include "sermux.h"
|
#include "sermux.h"
|
||||||
#include "rfs.h"
|
#include "rfs.h"
|
||||||
#include "deskutils.h"
|
#include "deskutils.h"
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
#include "net.h"
|
#include "net.h"
|
||||||
#include "remotefs.h"
|
#include "remotefs.h"
|
||||||
#include "eluarpc.h"
|
#include "eluarpc.h"
|
||||||
#include "serial.h"
|
#include "rfs_serial.h"
|
||||||
#include "server.h"
|
#include "server.h"
|
||||||
#include "type.h"
|
#include "type.h"
|
||||||
#include "log.h"
|
#include "log.h"
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
#include "net.h"
|
#include "net.h"
|
||||||
#include "remotefs.h"
|
#include "remotefs.h"
|
||||||
#include "eluarpc.h"
|
#include "eluarpc.h"
|
||||||
#include "serial.h"
|
#include "rfs_serial.h"
|
||||||
#include "server.h"
|
#include "server.h"
|
||||||
#include "type.h"
|
#include "type.h"
|
||||||
#include "log.h"
|
#include "log.h"
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
// Serial inteface implementation for POSIX-compliant systems
|
// Serial inteface implementation for POSIX-compliant systems
|
||||||
|
|
||||||
#include "serial.h"
|
#include "rfs_serial.h"
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include "type.h"
|
#include "type.h"
|
||||||
#include "serial.h"
|
#include "rfs_serial.h"
|
||||||
|
|
||||||
#define WIN_ERROR ( HANDLE )-1
|
#define WIN_ERROR ( HANDLE )-1
|
||||||
#define WIN_MAX_PORT_NAME MAX_PATH
|
#define WIN_MAX_PORT_NAME MAX_PATH
|
||||||
|
@ -14,7 +14,7 @@
|
|||||||
#include "lauxlib.h"
|
#include "lauxlib.h"
|
||||||
|
|
||||||
#include "luarpc_rpc.h"
|
#include "luarpc_rpc.h"
|
||||||
#include "serial.h"
|
#include "rpc_serial.h"
|
||||||
|
|
||||||
#ifndef LUA_CROSS_COMPILER
|
#ifndef LUA_CROSS_COMPILER
|
||||||
#include "platform_conf.h"
|
#include "platform_conf.h"
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
// Serial inteface implementation for POSIX-compliant systems
|
// Serial inteface implementation for POSIX-compliant systems
|
||||||
|
|
||||||
#include "serial.h"
|
#include "rpc_serial.h"
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
#include <windows.h>
|
#include <windows.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include "serial.h"
|
#include "rpc_serial.h"
|
||||||
|
|
||||||
#define WIN_ERROR ( HANDLE )-1
|
#define WIN_ERROR ( HANDLE )-1
|
||||||
#define WIN_MAX_PORT_NAME 1024
|
#define WIN_MAX_PORT_NAME 1024
|
||||||
|
Loading…
x
Reference in New Issue
Block a user