YARN-9319. Fix compilation issue of handling typedef an existing name…

… by gcc compiler. (Zhankun Tang via wangda) Change-Id: Ie8293cc5b710ff355fb6a1ea7201be53ed0385bf
apache · Feb 21, 2019 · b17a260 · b17a260
1 parent 6c4ab03
commit b17a260
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/...rver-nodemanager/src/main/native/container-executor/impl/modules/devices/devices-module.c b/...rver-nodemanager/src/main/native/container-executor/impl/modules/devices/devices-module.c
@@ -82,7 +82,7 @@ static int is_block_device(const char* value) {
 }
 
 static int internal_handle_devices_request(
-    update_cgroups_parameters_function update_cgroups_parameters_func_p,
+    update_cgroups_param_function update_cgroups_parameters_func_p,
     char** deny_devices_number_tokens,
     char** allow_devices_number_tokens,
     const char* container_id) {
@@ -196,7 +196,7 @@ void reload_devices_configuration() {
  * --allowed_devices 8:32,8:48,243:2 \
  * --container_id container_x_y
  */
-int handle_devices_request(update_cgroups_parameters_function func,
+int handle_devices_request(update_cgroups_param_function func,
     const char* module_name, int module_argc, char** module_argv) {
   if (!cfg_section) {
     reload_devices_configuration();

diff --git a/...rver-nodemanager/src/main/native/container-executor/impl/modules/devices/devices-module.h b/...rver-nodemanager/src/main/native/container-executor/impl/modules/devices/devices-module.h
@@ -28,13 +28,13 @@
 #define DEVICES_MODULE_SECTION_NAME "devices"
 
 // For unit test stubbing
-typedef int (*update_cgroups_parameters_function)(const char*, const char*,
+typedef int (*update_cgroups_param_function)(const char*, const char*,
    const char*, const char*);
 
 /**
  * Handle devices requests
  */
-int handle_devices_request(update_cgroups_parameters_function func,
+int handle_devices_request(update_cgroups_param_function func,
    const char* module_name, int module_argc, char** module_argv);
 
 /**