From 522a5e059582a513f7af8e418a1e8611aafb3513 Mon Sep 17 00:00:00 2001
From: Martin Baute <solar@rootdirectory.de>
Date: Mon, 14 Mar 2016 07:17:51 +0100
Subject: [PATCH] Moved notime and mincoll from opt/ to functions/.

---
 functions/_dlmalloc/dlmalloc.h                | 2 --
 {opt/notime => functions/time}/time.c         | 0
 {opt/notime => functions/time}/timespec_get.c | 0
 {opt/mincoll => functions/wchar}/wcscoll.c    | 0
 {opt/mincoll => functions/wchar}/wcsxfrm.c    | 0
 platform/example/Config.jam                   | 1 -
 platform/gandr/Config.jam                     | 2 --
 platform/posix/Config.jam                     | 1 -
 platform/win32/Config.jam                     | 2 --
 9 files changed, 8 deletions(-)
 rename {opt/notime => functions/time}/time.c (100%)
 rename {opt/notime => functions/time}/timespec_get.c (100%)
 rename {opt/mincoll => functions/wchar}/wcscoll.c (100%)
 rename {opt/mincoll => functions/wchar}/wcsxfrm.c (100%)

diff --git a/functions/_dlmalloc/dlmalloc.h b/functions/_dlmalloc/dlmalloc.h
index bf53a68..b68aa34 100644
--- a/functions/_dlmalloc/dlmalloc.h
+++ b/functions/_dlmalloc/dlmalloc.h
@@ -1,5 +1,3 @@
-#include "_PDCLIB_aux.h"
-#include "_PDCLIB_config.h"
 #include "_PDCLIB_glue.h"
 #include <threads.h>
 
diff --git a/opt/notime/time.c b/functions/time/time.c
similarity index 100%
rename from opt/notime/time.c
rename to functions/time/time.c
diff --git a/opt/notime/timespec_get.c b/functions/time/timespec_get.c
similarity index 100%
rename from opt/notime/timespec_get.c
rename to functions/time/timespec_get.c
diff --git a/opt/mincoll/wcscoll.c b/functions/wchar/wcscoll.c
similarity index 100%
rename from opt/mincoll/wcscoll.c
rename to functions/wchar/wcscoll.c
diff --git a/opt/mincoll/wcsxfrm.c b/functions/wchar/wcsxfrm.c
similarity index 100%
rename from opt/mincoll/wcsxfrm.c
rename to functions/wchar/wcsxfrm.c
diff --git a/platform/example/Config.jam b/platform/example/Config.jam
index 9b4d072..06ee0c4 100644
--- a/platform/example/Config.jam
+++ b/platform/example/Config.jam
@@ -11,7 +11,6 @@ if $(PDCLIB_TOOLCHAIN) = "gcc" {
 
 PDCLIB_OPTIONS = 
 	nothread 
-	notime 
 	tss_errno 
 	basecodecs 
     c_locale 
diff --git a/platform/gandr/Config.jam b/platform/gandr/Config.jam
index 5a1b86c..329dbfc 100644
--- a/platform/gandr/Config.jam
+++ b/platform/gandr/Config.jam
@@ -5,8 +5,6 @@ rule PDCLibTargetHeaders {
 
 PDCLIB_OPTIONS = 
     nothread
-    notime 
-    mincoll 
     tss_errno 
     basecodecs 
     c_locale 
diff --git a/platform/posix/Config.jam b/platform/posix/Config.jam
index db43ae3..d25448c 100644
--- a/platform/posix/Config.jam
+++ b/platform/posix/Config.jam
@@ -13,6 +13,5 @@ if $(OS) = "MACOSX" {
 
 PDCLIB_OPTIONS =
     pthreads
-    notime
     basecodecs
     c_locale ;
diff --git a/platform/win32/Config.jam b/platform/win32/Config.jam
index ac45789..15834e1 100644
--- a/platform/win32/Config.jam
+++ b/platform/win32/Config.jam
@@ -24,8 +24,6 @@ if $(PDCLIB_TOOLCHAIN) = "gcc" {
 }
 
 PDCLIB_OPTIONS = 
-    notime 
-    mincoll 
     tss_errno 
     basecodecs 
     c_locale 
-- 
2.40.0