Skip to content

Commit b17a260

Browse files
committed
YARN-9319. Fix compilation issue of handling typedef an existing name by gcc compiler. (Zhankun Tang via wangda)
Change-Id: Ie8293cc5b710ff355fb6a1ea7201be53ed0385bf
1 parent 6c4ab03 commit b17a260

File tree

2 files changed

+4
-4
lines changed
  • hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/native/container-executor/impl/modules/devices

2 files changed

+4
-4
lines changed

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/native/container-executor/impl/modules/devices/devices-module.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ static int is_block_device(const char* value) {
8282
}
8383

8484
static int internal_handle_devices_request(
85-
update_cgroups_parameters_function update_cgroups_parameters_func_p,
85+
update_cgroups_param_function update_cgroups_parameters_func_p,
8686
char** deny_devices_number_tokens,
8787
char** allow_devices_number_tokens,
8888
const char* container_id) {
@@ -196,7 +196,7 @@ void reload_devices_configuration() {
196196
* --allowed_devices 8:32,8:48,243:2 \
197197
* --container_id container_x_y
198198
*/
199-
int handle_devices_request(update_cgroups_parameters_function func,
199+
int handle_devices_request(update_cgroups_param_function func,
200200
const char* module_name, int module_argc, char** module_argv) {
201201
if (!cfg_section) {
202202
reload_devices_configuration();

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/native/container-executor/impl/modules/devices/devices-module.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@
2828
#define DEVICES_MODULE_SECTION_NAME "devices"
2929

3030
// For unit test stubbing
31-
typedef int (*update_cgroups_parameters_function)(const char*, const char*,
31+
typedef int (*update_cgroups_param_function)(const char*, const char*,
3232
const char*, const char*);
3333

3434
/**
3535
* Handle devices requests
3636
*/
37-
int handle_devices_request(update_cgroups_parameters_function func,
37+
int handle_devices_request(update_cgroups_param_function func,
3838
const char* module_name, int module_argc, char** module_argv);
3939

4040
/**

0 commit comments

Comments
 (0)