diff options
| author | marha <marha@users.sourceforge.net> | 2012-06-15 08:55:18 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-06-15 08:55:18 +0200 |
| commit | d6f64084b9bc07d0bdd527f9354f2d1d962ed16d (patch) | |
| tree | 81b2652d421992fd63143a04885e332e83e18d07 /xorg-server/test/touch.c | |
| parent | 669b562a737c9418c53bfae69c0dbf1aabe318b4 (diff) | |
| parent | 7a2af605c2c2b0d2e9bbb0b161eba8842acefbcb (diff) | |
| download | vcxsrv-d6f64084b9bc07d0bdd527f9354f2d1d962ed16d.tar.gz vcxsrv-d6f64084b9bc07d0bdd527f9354f2d1d962ed16d.tar.bz2 vcxsrv-d6f64084b9bc07d0bdd527f9354f2d1d962ed16d.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
fontconfig/src/fcint.h
fontconfig/src/fcstat.c
mesalib/src/mapi/glapi/gen/GL3x.xml
xorg-server/glx/glxext.h
Diffstat (limited to 'xorg-server/test/touch.c')
| -rw-r--r-- | xorg-server/test/touch.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/xorg-server/test/touch.c b/xorg-server/test/touch.c index 2ec535b43..df1db11de 100644 --- a/xorg-server/test/touch.c +++ b/xorg-server/test/touch.c @@ -40,6 +40,7 @@ touch_grow_queue(void) int i; memset(&dev, 0, sizeof(dev)); + dev.name = "test device"; dev.id = 2; dev.valuator = &val; val.numAxes = 5; @@ -94,6 +95,7 @@ touch_find_ddxid(void) int i; memset(&dev, 0, sizeof(dev)); + dev.name = "test device"; dev.id = 2; dev.valuator = &val; val.numAxes = 5; @@ -162,6 +164,7 @@ touch_begin_ddxtouch(void) int size = 5; memset(&dev, 0, sizeof(dev)); + dev.name = "test device"; dev.id = 2; dev.valuator = &val; val.numAxes = 5; @@ -209,6 +212,7 @@ touch_begin_touch(void) screenInfo.screens[0] = &screen; memset(&dev, 0, sizeof(dev)); + dev.name = "test device"; dev.id = 2; memset(&sprite, 0, sizeof(sprite)); @@ -247,6 +251,7 @@ touch_init(void) screenInfo.screens[0] = &screen; memset(&dev, 0, sizeof(dev)); + dev.name = "test device"; memset(&sprite, 0, sizeof(sprite)); dev.spriteInfo = &sprite; |