Browse Source

[LibOS] Rename clone_args to shim_clone_args

Linux already defines `struct clone_args` for clone3. Rename LibOS one
to avoid name collision.
Isaku Yamahata 5 years ago
parent
commit
03f9e2cf1e
2 changed files with 3 additions and 3 deletions
  1. 1 1
      LibOS/shim/include/shim_thread.h
  2. 2 2
      LibOS/shim/src/sys/shim_clone.c

+ 1 - 1
LibOS/shim/include/shim_thread.h

@@ -320,7 +320,7 @@ int thread_exit (struct shim_thread * self, bool send_ipc);
 int try_process_exit (int error_code, int term_signal);
 
 /* thread cloning helpers */
-struct clone_args {
+struct shim_clone_args {
     PAL_HANDLE create_event;
     PAL_HANDLE initialize_event;
     struct shim_thread * parent, * thread;

+ 2 - 2
LibOS/shim/src/sys/shim_clone.c

@@ -114,7 +114,7 @@ static void fixup_child_context(struct shim_regs * regs)
  */
 #define PTHREAD_PADDING 2048
 
-static int clone_implementation_wrapper(struct clone_args * arg)
+static int clone_implementation_wrapper(struct shim_clone_args * arg)
 {
     //The child thread created by PAL is now running on the
     //PAL allocated stack. We need to switch the stack to use
@@ -368,7 +368,7 @@ int shim_do_clone (int flags, void * user_stack_addr, int * parent_tidptr,
 
     enable_locking();
 
-    struct clone_args new_args;
+    struct shim_clone_args new_args;
     memset(&new_args, 0, sizeof(new_args));
 
     new_args.create_event = DkNotificationEventCreate(PAL_FALSE);