diff options
| author | Michael Speth <[email protected]> | 2012-10-26 00:00:52 +1300 |
|---|---|---|
| committer | Michael Speth <[email protected]> | 2012-10-26 00:00:52 +1300 |
| commit | ed3c33ad8fb52c0266222fdfd57d543a7b2f96b6 (patch) | |
| tree | 4eab32d5cb34e1c45c6cf6f3192dfe5821d12bd9 | |
| parent | ae32e7376f108425bda1c607e872658953e6882f (diff) | |
Looks to be a merge conflict, fixed it.
| -rw-r--r-- | plugins/linux/src/native/net_java_games_input_LinuxEventDevice.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/plugins/linux/src/native/net_java_games_input_LinuxEventDevice.c b/plugins/linux/src/native/net_java_games_input_LinuxEventDevice.c index 044c3dd..702f268 100644 --- a/plugins/linux/src/native/net_java_games_input_LinuxEventDevice.c +++ b/plugins/linux/src/native/net_java_games_input_LinuxEventDevice.c @@ -245,12 +245,7 @@ JNIEXPORT void JNICALL Java_net_java_games_input_LinuxEventDevice_nEraseEffect(J JNIEXPORT jint JNICALL Java_net_java_games_input_LinuxEventDevice_nGrab(JNIEnv *env, jclass unused, jlong fd_address, jint do_grab) { int fd = (int)fd_address; int grab = (int)do_grab; -<<<<<<< HEAD - int version; - if (ioctl(fd,EVIOCGRAB,do_grab) == -1){ -======= if (ioctl(fd,EVIOCGRAB,grab) == -1){ ->>>>>>> 835f3b36964d5a757ab4baea8240f1d56a97e375 throwIOException(env, "Failed to grab device (%d)\n", errno); return -1; } |