From d87e93bf40ad1e8e0cd71fa7bca1d4dd1ad9b14c Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Wed, 12 Feb 2025 11:24:02 +0100
Subject: [PATCH] xfree86: xf86int10module: use explicit field initializers for
 XF86ModuleData

Even though the order of these fields shouldn't change anytime
soon, it's still better programming style to name'em explicitly.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1788>
---
 hw/xfree86/int10/xf86int10module.c | 35 +++++++++++++-----------------
 1 file changed, 15 insertions(+), 20 deletions(-)

diff --git a/hw/xfree86/int10/xf86int10module.c b/hw/xfree86/int10/xf86int10module.c
index 1eb5a0783..00e4ce34a 100644
--- a/hw/xfree86/int10/xf86int10module.c
+++ b/hw/xfree86/int10/xf86int10module.c
@@ -7,26 +7,21 @@
 #include <xorg-config.h>
 #endif
 
-#include "xf86.h"
-#include "xf86str.h"
-#include "xf86Pci.h"
-#include "xf86int10.h"
+#include "xf86Module.h"
 
-#ifndef MOD_NAME
-#define MOD_NAME int10
-#endif
-
-#define stringify(x) #x
-#define STRING(x) stringify(x)
-#define concat(x,y) x ## y
-#define combine(a,b) concat(a,b)
-#define NAME(x) combine(MOD_NAME,x)
-
-static XF86ModuleVersionInfo NAME(VersRec) = {
-    STRING(NAME()), MODULEVENDORSTRING, MODINFOSTRING1, MODINFOSTRING2, XORG_VERSION_CURRENT, 1, 0, 0, ABI_CLASS_VIDEODRV,      /* needs the video driver ABI */
-        ABI_VIDEODRV_VERSION, MOD_CLASS_NONE, {
-    0, 0, 0, 0}
+static XF86ModuleVersionInfo VersRec = {
+    .modname      = "int10",
+    .vendor       = MODULEVENDORSTRING,
+    ._modinfo1_   = MODINFOSTRING1,
+    ._modinfo2_   = MODINFOSTRING2,
+    .xf86version  = XORG_VERSION_CURRENT,
+    .majorversion = 1,
+    .minorversion = 0,
+    .patchlevel   = 0,
+    .abiclass     = ABI_CLASS_VIDEODRV,
+    .abiversion   = ABI_VIDEODRV_VERSION,
 };
 
-_X_EXPORT XF86ModuleData NAME(ModuleData) = {
-&NAME(VersRec), NULL, NULL};
+_X_EXPORT XF86ModuleData int10ModuleData = {
+    .vers = &VersRec
+};