[hadoop] branch trunk updated: YARN-9319. Fix compilation issue of handling typedef an existing name by gcc compiler. (Zhankun Tang via wangda)

[wa...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

wangda pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git


The following commit(s) were added to refs/heads/trunk by this push:
     new b17a260  YARN-9319. Fix compilation issue of handling typedef an existing name by gcc compiler. (Zhankun Tang via wangda)
b17a260 is described below

commit b17a2602d1fcece0979feb1438a3e71099126bef
Author: Wangda Tan <wa...@apache.org>
AuthorDate: Thu Feb 21 11:17:32 2019 -0800

    YARN-9319. Fix compilation issue of handling typedef an existing name by gcc compiler. (Zhankun Tang via wangda)
    
    Change-Id: Ie8293cc5b710ff355fb6a1ea7201be53ed0385bf
---
 .../native/container-executor/impl/modules/devices/devices-module.c   | 4 ++--
 .../native/container-executor/impl/modules/devices/devices-module.h   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/native/container-executor/impl/modules/devices/devices-module.c b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/native/container-executor/impl/modules/devices/devices-module.c
index 9df6662..4063bae 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/native/container-executor/impl/modules/devices/devices-module.c
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/native/container-executor/impl/modules/devices/devices-module.c
@@ -82,7 +82,7 @@ cleanup:
 }
 
 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/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/native/container-executor/impl/modules/devices/devices-module.h b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/native/container-executor/impl/modules/devices/devices-module.h
index c5d6785..552d070 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/native/container-executor/impl/modules/devices/devices-module.h
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-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);
 
 /**


---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org