Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
M
micropython
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
card10
micropython
Commits
ce2d34d7
Commit
ce2d34d7
authored
9 years ago
by
Damien George
Browse files
Options
Downloads
Patches
Plain Diff
drivers/cc3000: Rename timeval to cc3000_timeval, to avoid clash.
The timeval struct can be defined by system C headers.
parent
79a38a7a
No related branches found
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
drivers/cc3000/inc/cc3000_common.h
+2
-2
2 additions, 2 deletions
drivers/cc3000/inc/cc3000_common.h
drivers/cc3000/inc/socket.h
+1
-1
1 addition, 1 deletion
drivers/cc3000/inc/socket.h
drivers/cc3000/src/socket.c
+1
-1
1 addition, 1 deletion
drivers/cc3000/src/socket.c
with
4 additions
and
4 deletions
drivers/cc3000/inc/cc3000_common.h
+
2
−
2
View file @
ce2d34d7
...
...
@@ -169,9 +169,9 @@ typedef INT32 time_t;
typedef
UINT32
clock_t
;
typedef
INT32
suseconds_t
;
typedef
struct
timeval
timeval
;
typedef
struct
cc3000_
timeval
cc3000_
timeval
;
struct
timeval
struct
cc3000_
timeval
{
time_t
tv_sec
;
/* seconds */
suseconds_t
tv_usec
;
/* microseconds */
...
...
This diff is collapsed.
Click to expand it.
drivers/cc3000/inc/socket.h
+
1
−
1
View file @
ce2d34d7
...
...
@@ -416,7 +416,7 @@ extern INT32 CC3000_EXPORT(connect)(INT32 sd, const sockaddr *addr, INT32 addrle
//
//*****************************************************************************
extern
INT16
CC3000_EXPORT
(
select
)(
INT32
nfds
,
fd_set
*
readsds
,
fd_set
*
writesds
,
fd_set
*
exceptsds
,
struct
timeval
*
timeout
);
fd_set
*
exceptsds
,
struct
cc3000_
timeval
*
timeout
);
//*****************************************************************************
//
...
...
This diff is collapsed.
Click to expand it.
drivers/cc3000/src/socket.c
+
1
−
1
View file @
ce2d34d7
...
...
@@ -587,7 +587,7 @@ INT32 CC3000_EXPORT(connect)(INT32 sd, const sockaddr *addr, INT32 addrlen)
//*****************************************************************************
INT16
CC3000_EXPORT
(
select
)(
INT32
nfds
,
fd_set
*
readsds
,
fd_set
*
writesds
,
fd_set
*
exceptsds
,
struct
timeval
*
timeout
)
struct
cc3000_
timeval
*
timeout
)
{
UINT8
*
ptr
,
*
args
;
tBsdSelectRecvParams
tParams
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment