| Chunk |
|---|
| Conflicting content |
|---|
int setsid();
int setuid(int uid);
int kill(int pid, int signal);
<<<<<<< HEAD
int getdtablesize();
=======
int dup(int fd);
int dup2(int oldFd, int newFd);
>>>>>>> 53ddb7a8a8fd5c86c87c7dc989f801388ec003e4
public interface LibCSignalHandler {
@Delegate void signal(int sig); |
| Solution content |
|---|
int setsid();
int setuid(int uid);
int kill(int pid, int signal);
int dup(int fd);
int dup2(int oldFd, int newFd);
int getdtablesize();
public interface LibCSignalHandler {
@Delegate void signal(int sig); |
| File |
|---|
| LibC.java |
| Developer's decision |
|---|
| Concatenation |
| Kind of conflict |
|---|
| Method interface |