Bug#1066413: trinity: FTBFS: fds/memfd.c:22:12: error: static declaration of ‘memfd_create’ follows non-static declaration

[Santiago Vila]

tags 1066413 + patch
thanks

Lucas Nussbaum wrote:

fds/memfd.c:22:12: error: static declaration of ‘memfd_create’ follows 
non-static declaration
   22 | static int memfd_create(__unused__ const char *uname, __unused__ 
unsigned int flag)
      |            ^~~~~~~~~~~~

Hello Gustavo.

I see that this is fixed upstream. After importing the current snapshot,
the above error does not happen anymore. Instead, there are now two
"duplicate definition" errors, but those are easy to fix.

Please try the attached patch and/or forward the problem upstream.
(The author has removed the TODO file, but apparently they are still
willing to fix build problems like this one).

Thanks.
--- a/ioctls/drm.c
+++ b/ioctls/drm.c
@@ -130,20 +130,20 @@ struct drm_nouveau_grobj_alloc {
 #endif
 
 #ifndef DRM_IOCTL_NOUVEAU_NOTIFIEROBJ_ALLOC
-struct drm_nouveau_notifierobj_alloc {
+/* struct drm_nouveau_notifierobj_alloc {
        uint32_t channel;
        uint32_t handle;
        uint32_t size;
        uint32_t offset;
-};
+}; duplicate definition */
 #define DRM_IOCTL_NOUVEAU_NOTIFIEROBJ_ALLOC  DRM_IOWR(DRM_COMMAND_BASE + 
DRM_NOUVEAU_NOTIFIEROBJ_ALLOC, struct drm_nouveau_notifierobj_alloc)
 #endif
 
 #ifndef DRM_IOCTL_NOUVEAU_GPUOBJ_FREE
-struct drm_nouveau_gpuobj_free {
+/* struct drm_nouveau_gpuobj_free {
        int      channel;
        uint32_t handle;
-};
+}; duplicate definition */
 #define DRM_IOCTL_NOUVEAU_GPUOBJ_FREE        DRM_IOW (DRM_COMMAND_BASE + 
DRM_NOUVEAU_GPUOBJ_FREE, struct drm_nouveau_gpuobj_free)
 #endif