Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
- uses: EmbarkStudios/cargo-deny-action@e2f4ede4a4e60ea15ff31bc0647485d80c66cfba # v2.0.4
- uses: EmbarkStudios/cargo-deny-action@76cd80eb775d7bbbd2d80292136d74d39e1b4918 # v2.0.14
with:
manifest-path: rust/Cargo.toml

Expand Down
24 changes: 12 additions & 12 deletions src/ittnotify/ittnotify_config.h
Original file line number Diff line number Diff line change
Expand Up @@ -604,14 +604,14 @@ typedef struct ___itt_global
} \
}

#define NEW_COUNTER_W(gptr,h,h_tail,name,domain,type) { \
#define NEW_COUNTER_W(gptr,h,h_tail,name,domain,_type) { \
h = (__itt_counter_info_t*)malloc(sizeof(__itt_counter_info_t)); \
if (h != NULL) { \
h->nameA = NULL; \
h->nameW = name ? _wcsdup(name) : NULL; \
h->domainA = NULL; \
h->domainW = domain ? _wcsdup(domain) : NULL; \
h->type = type; \
h->type = _type; \
h->index = 0; \
h->next = NULL; \
if (h_tail == NULL) \
Expand All @@ -621,7 +621,7 @@ typedef struct ___itt_global
} \
}

#define NEW_COUNTER_A(gptr,h,h_tail,name,domain,type) { \
#define NEW_COUNTER_A(gptr,h,h_tail,name,domain,_type) { \
h = (__itt_counter_info_t*)malloc(sizeof(__itt_counter_info_t)); \
if (h != NULL) { \
char *name_copy = NULL; \
Expand All @@ -632,7 +632,7 @@ typedef struct ___itt_global
__itt_fstrdup(domain, domain_copy); \
h->domainA = domain_copy; \
h->domainW = NULL; \
h->type = type; \
h->type = _type; \
h->index = 0; \
h->next = NULL; \
if (h_tail == NULL) \
Expand All @@ -642,14 +642,14 @@ typedef struct ___itt_global
} \
}

#define NEW_HISTOGRAM_W(gptr,h,h_tail,domain,name,x_type,y_type) { \
#define NEW_HISTOGRAM_W(gptr,h,h_tail,_domain,name,_x_type,_y_type) { \
h = (__itt_histogram*)malloc(sizeof(__itt_histogram)); \
if (h != NULL) { \
h->domain = domain; \
h->domain = _domain; \
h->nameA = NULL; \
h->nameW = name ? _wcsdup(name) : NULL; \
h->x_type = x_type; \
h->y_type = y_type; \
h->x_type = _x_type; \
h->y_type = _y_type; \
h->extra1 = 0; \
h->extra2 = NULL; \
h->next = NULL; \
Expand All @@ -660,16 +660,16 @@ typedef struct ___itt_global
} \
}

#define NEW_HISTOGRAM_A(gptr,h,h_tail,domain,name,x_type,y_type) { \
#define NEW_HISTOGRAM_A(gptr,h,h_tail,_domain,name,_x_type,_y_type) { \
h = (__itt_histogram*)malloc(sizeof(__itt_histogram)); \
if (h != NULL) { \
h->domain = domain; \
h->domain = _domain; \
char *name_copy = NULL; \
__itt_fstrdup(name, name_copy); \
h->nameA = name_copy; \
h->nameW = NULL; \
h->x_type = x_type; \
h->y_type = y_type; \
h->x_type = _x_type; \
h->y_type = _y_type; \
h->extra1 = 0; \
h->extra2 = NULL; \
h->next = NULL; \
Expand Down
Loading
Loading