summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorstefanf <stefanf@FreeBSD.org>2004-07-03 16:52:57 +0000
committerstefanf <stefanf@FreeBSD.org>2004-07-03 16:52:57 +0000
commit9162daacbf5d0af11e5327f3f483d8ca9b02564f (patch)
tree5bc04aae121472348b2d9f9f658231653f998b6d
parentab16560f3305829961b71dbe71233abcd50f0aba (diff)
downloadFreeBSD-src-9162daacbf5d0af11e5327f3f483d8ca9b02564f.zip
FreeBSD-src-9162daacbf5d0af11e5327f3f483d8ca9b02564f.tar.gz
Use C99 conforming designated initialisers rather than the obsolete GCC syntax.
-rw-r--r--usr.sbin/moused/moused.c34
-rw-r--r--usr.sbin/sysinstall/dist.c2
2 files changed, 18 insertions, 18 deletions
diff --git a/usr.sbin/moused/moused.c b/usr.sbin/moused/moused.c
index b08365f..5a458e4 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 287f030..bcf3bf9 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])
OpenPOWER on IntegriCloud