test: Rename util.c and util.h to util-x11.c and util-x11.h

[fips] / test / glx-dlopen-gpaa.c

diff --git a/test/glx-dlopen-gpaa.c b/test/glx-dlopen-gpaa.c
index b4aea47a0a7be1531857cb1d7a83f3a17fb4cdca..1189c3c00d96bcf7e9948686b6b4dc78ea5e1b43 100644 (file)
--- a/test/glx-dlopen-gpaa.c
+++ b/test/glx-dlopen-gpaa.c
@@ -34,7 +34,7 @@
 #include <stdlib.h>
 #include <dlfcn.h>
 
-#include "util.h"
+#include "util-x11.h"
 
 void* (*my_glXGetProcAddressARB) (char *);
 void (*my_glClear) (GLbitfield);
@@ -147,13 +147,17 @@ main (void)
         Display *dpy;
         Window window;
 
-       util_init_display_window (&dpy, &window);
+       util_x11_init_display (&dpy);
+
+       util_x11_init_window (dpy, &window);
 
        resolve_symbols ();
 
         handle_events (dpy, window);
 
-       util_fini_display_window (dpy, window);
+       util_x11_fini_window (dpy, window);
+
+       util_x11_fini_display (dpy);
 
         return 0;
 }