Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
L
libcdi
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mpim-sw
libcdi
Commits
d6fbc4d6
Commit
d6fbc4d6
authored
1 month ago
by
Mathieu Westphal
Browse files
Options
Downloads
Patches
Plain Diff
Windows: Remove cdiCreateUUID on Windows
parent
082fa311
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!135
Windows support
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/cdi_uuid.h
+2
-0
2 additions, 0 deletions
src/cdi_uuid.h
src/util.c
+2
-0
2 additions, 0 deletions
src/util.c
with
4 additions
and
0 deletions
src/cdi_uuid.h
+
2
−
0
View file @
d6fbc4d6
...
...
@@ -24,7 +24,9 @@ int cdiUUIDIsNull(const unsigned char uuid[])
return
isNull
;
}
#ifndef _WIN32
void
cdiCreateUUID
(
unsigned
char
uuid
[
CDI_UUID_SIZE
]);
#endif
int
cdiUUID2Str
(
const
unsigned
char
uuid
[],
char
uuidstr
[]);
int
cdiStr2UUID
(
const
char
*
uuidstr
,
unsigned
char
uuid
[]);
...
...
This diff is collapsed.
Click to expand it.
src/util.c
+
2
−
0
View file @
d6fbc4d6
...
...
@@ -100,6 +100,7 @@ cdiUnescapeSpaces(const char *string, const char **outStringEnd)
return
result
;
}
#ifndef _WIN32
#if defined(HAVE_DECL_UUID_GENERATE) && defined(HAVE_UUID_UUID_H)
#ifdef HAVE_SYS_TIME_H
#include
<sys/time.h>
...
...
@@ -252,6 +253,7 @@ cdiCreateUUID(unsigned char *uuid)
#endif
}
#endif
#endif
/*
* Local Variables:
...
...
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