From 358f61ce3247ec5211f6486b93d750381a32c71b Mon Sep 17 00:00:00 2001 From: Stefan Farfeleder Date: Sat, 3 Jul 2004 16:52:57 +0000 Subject: [PATCH] Use C99 conforming designated initialisers rather than the obsolete GCC syntax. --- usr.sbin/moused/moused.c | 34 +++++++++++++++++----------------- usr.sbin/sysinstall/dist.c | 2 +- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/usr.sbin/moused/moused.c b/usr.sbin/moused/moused.c index b08365fb72e3..5a458e43f4b2 100644 --- a/usr.sbin/moused/moused.c +++ b/usr.sbin/moused/moused.c @@ -380,23 +380,23 @@ static struct rodentparam { float accelx; /* Acceleration in the X axis */ float accely; /* Acceleration in the Y axis */ } rodent = { - flags : 0, - portname : NULL, - rtype : MOUSE_PROTO_UNKNOWN, - level : -1, - baudrate : 1200, - rate : 0, - resolution : MOUSE_RES_UNKNOWN, - zmap: { 0, 0, 0, 0 }, - wmode: 0, - mfd : -1, - cfd : -1, - mremsfd : -1, - mremcfd : -1, - clickthreshold : DFLT_CLICKTHRESHOLD, - button2timeout : DFLT_BUTTON2TIMEOUT, - accelx : 1.0, - accely : 1.0, + .flags = 0, + .portname = NULL, + .rtype = MOUSE_PROTO_UNKNOWN, + .level = -1, + .baudrate = 1200, + .rate = 0, + .resolution = MOUSE_RES_UNKNOWN, + .zmap = { 0, 0, 0, 0 }, + .wmode = 0, + .mfd = -1, + .cfd = -1, + .mremsfd = -1, + .mremcfd = -1, + .clickthreshold = DFLT_CLICKTHRESHOLD, + .button2timeout = DFLT_BUTTON2TIMEOUT, + .accelx = 1.0, + .accely = 1.0, }; /* button status */ diff --git a/usr.sbin/sysinstall/dist.c b/usr.sbin/sysinstall/dist.c index 287f03010641..bcf3bf9a12e6 100644 --- a/usr.sbin/sysinstall/dist.c +++ b/usr.sbin/sysinstall/dist.c @@ -74,7 +74,7 @@ extern Distribution XF86ServerDistTable[]; #define DTE_PACKAGE(name, mask, flag, package) \ { name, mask, DIST_ ## flag, DT_PACKAGE, { package } } #define DTE_SUBDIST(name, mask, flag, subdist) \ - { name, mask, DIST_ ## flag, DT_SUBDIST, { my_dist: subdist } } + { name, mask, DIST_ ## flag, DT_SUBDIST, { .my_dist = subdist } } #define BASE_DIST (&DistTable[0])