From 95812645510d67f1723f8d45069caf9ca3489ad7 Mon Sep 17 00:00:00 2001
From: SFT Nightlies <sftnight@lcgapp-slc6-x86-64-33.cern.ch>
Date: Fri, 18 May 2018 15:16:15 +0200
Subject: [PATCH] stdlib.h is meant to be a textual header.
Add back the stdlib module in libc, move sys/types.h, too.
This patch should resolve a recently introduced include cycle.
---
build/unix/libc.modulemap | 22 ++++++++++------------
1 file changed, 10 insertions(+), 12 deletions(-)
diff --git a/build/unix/libc.modulemap b/build/unix/libc.modulemap
index 6ea8259a2d5..effd2f83e3f 100644
--- a/build/unix/libc.modulemap
+++ b/build/unix/libc.modulemap
@@ -36,7 +36,11 @@ module "libc" [system] {
export *
header "stdio.h"
}
- module "time.h" {
+ module "stdlib.h" {
+ export *
+ textual header "stdlib.h"
+ }
+ module "time.h" {
export *
header "time.h"
}
@@ -44,6 +48,11 @@ module "libc" [system] {
export *
header "sys/stat.h"
}
+ // System header that we have difficult with merging.
+ module "sys_types.h" {
+ export *
+ header "sys/types.h"
+ }
}
// glib specific header. In it's own module because it
@@ -52,14 +61,3 @@ module "xlocale.h" [system] {
export *
header "xlocale.h"
}
-
-// System header that we have difficult with merging.
-module "sys_types.h" [system] {
- export *
- header "sys/types.h"
-}
-
-module "stdlib.h" [system] {
- export *
- header "stdlib.h"
-}
--
GitLab