From fcf43c8d327b5608a7fc5baa9729848e5147b87b Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Thu, 14 Aug 2008 10:56:24 +0200 Subject: [PATCH] Move the lock and tls source files into a subdirectory. --- ChangeLog | 16 ++++++++++++++++ NEWS | 5 +++++ lib/fstrcmp.c | 7 ++++--- lib/{ => glthread}/lock.c | 2 +- lib/{ => glthread}/lock.h | 0 lib/{ => glthread}/tls.c | 2 +- lib/{ => glthread}/tls.h | 0 lib/strsignal.c | 4 ++-- modules/lock | 8 ++++---- modules/tls | 8 ++++---- tests/test-lock.c | 4 ++-- tests/test-tls.c | 4 ++-- 12 files changed, 41 insertions(+), 19 deletions(-) rename lib/{ => glthread}/lock.c (99%) rename lib/{ => glthread}/lock.h (100%) rename lib/{ => glthread}/tls.c (98%) rename lib/{ => glthread}/tls.h (100%) diff --git a/ChangeLog b/ChangeLog index eb10d66e4..d4be462ff 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,19 @@ +2008-08-14 Bruno Haible + + * lib/glthread/lock.h: Renamed from lib/lock.h. + * lib/glthread/lock.c: Renamed from lib/lock.c. Update includes. + * lib/glthread/tls.h: Renamed from lib/tls.h. + * lib/glthread/tls.c: Renamed from lib/tls.c. Update includes. + * lib/fstrcmp.c: Update includes. + * lib/strsignal.c: Update includes. + * modules/lock (Files, Makefile.am): Update. + (Include): Change to "glthread/lock.h". + * modules/tls (Files, Makefile.am): Update. + (Include): Change to "glthread/tls.h". + * tests/test-lock.c: Update includes. + * tests/test-tls.c: Update includes. + * NEWS: Mention the renamed header files. + 2008-08-11 Jim Meyering * lib/fts_.h: Fix grammar (insert a missing "is") in a comment. diff --git a/NEWS b/NEWS index da75d7f83..b5b08a60f 100644 --- a/NEWS +++ b/NEWS @@ -6,6 +6,11 @@ User visible incompatible changes Date Modules Changes +2008-08-14 lock The include file is changed from "lock.h" + to "glthread/lock.h". + tls The include file is changed from "tls.h" + to "glthread/tls.h". + 2008-07-17 c-stack The module now requires the addition of $(LIBCSTACK) or $(LTLIBCSTACK) in Makefile.am, since it may depend on linking with libsigsegv. diff --git a/lib/fstrcmp.c b/lib/fstrcmp.c index f0e51e727..70e68185d 100644 --- a/lib/fstrcmp.c +++ b/lib/fstrcmp.c @@ -1,5 +1,6 @@ /* Functions to make fuzzy comparisons between strings - Copyright (C) 1988-1989, 1992-1993, 1995, 2001-2003, 2006 Free Software Foundation, Inc. + Copyright (C) 1988-1989, 1992-1993, 1995, 2001-2003, 2006, 2008 + Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -50,8 +51,8 @@ #include #include -#include "lock.h" -#include "tls.h" +#include "glthread/lock.h" +#include "glthread/tls.h" #include "minmax.h" #include "xalloc.h" diff --git a/lib/lock.c b/lib/glthread/lock.c similarity index 99% rename from lib/lock.c rename to lib/glthread/lock.c index 4d97fa4ab..ac3a0d809 100644 --- a/lib/lock.c +++ b/lib/glthread/lock.c @@ -21,7 +21,7 @@ #include -#include "lock.h" +#include "glthread/lock.h" /* ========================================================================= */ diff --git a/lib/lock.h b/lib/glthread/lock.h similarity index 100% rename from lib/lock.h rename to lib/glthread/lock.h diff --git a/lib/tls.c b/lib/glthread/tls.c similarity index 98% rename from lib/tls.c rename to lib/glthread/tls.c index e857f611b..46832fe66 100644 --- a/lib/tls.c +++ b/lib/glthread/tls.c @@ -18,7 +18,7 @@ #include -#include "tls.h" +#include "glthread/tls.h" /* ========================================================================= */ diff --git a/lib/tls.h b/lib/glthread/tls.h similarity index 100% rename from lib/tls.h rename to lib/glthread/tls.h diff --git a/lib/strsignal.c b/lib/strsignal.c index 2e76bb896..a7adaba95 100644 --- a/lib/strsignal.c +++ b/lib/strsignal.c @@ -36,8 +36,8 @@ #ifdef _LIBC # include #else /* !_LIBC */ -# include "lock.h" -# include "tls.h" +# include "glthread/lock.h" +# include "glthread/tls.h" # define __libc_once_define(CLASS, NAME) gl_once_define (CLASS, NAME) # define __libc_once(NAME, INIT) gl_once ((NAME), (INIT)) # define __libc_key_t gl_tls_key_t diff --git a/modules/lock b/modules/lock index 9e203c2a9..6f18a61de 100644 --- a/modules/lock +++ b/modules/lock @@ -2,8 +2,8 @@ Description: Locking in multithreaded situations. Files: -lib/lock.h -lib/lock.c +lib/glthread/lock.h +lib/glthread/lock.c m4/lock.m4 build-aux/config.rpath @@ -17,10 +17,10 @@ configure.ac: gl_LOCK Makefile.am: -lib_SOURCES += lock.h lock.c +lib_SOURCES += glthread/lock.h glthread/lock.c Include: -"lock.h" +"glthread/lock.h" Link: $(LTLIBTHREAD) when linking with libtool, $(LIBTHREAD) otherwise diff --git a/modules/tls b/modules/tls index 00a81cc1e..8c325d971 100644 --- a/modules/tls +++ b/modules/tls @@ -2,8 +2,8 @@ Description: Thread-local storage in multithreaded situations. Files: -lib/tls.h -lib/tls.c +lib/glthread/tls.h +lib/glthread/tls.c m4/tls.m4 Depends-on: @@ -13,10 +13,10 @@ configure.ac: gl_TLS Makefile.am: -lib_SOURCES += tls.h tls.c +lib_SOURCES += glthread/tls.h glthread/tls.c Include: -"tls.h" +"glthread/tls.h" License: LGPLv2+ diff --git a/tests/test-lock.c b/tests/test-lock.c index 2d10833c2..6d2278e04 100644 --- a/tests/test-lock.c +++ b/tests/test-lock.c @@ -1,5 +1,5 @@ /* Test of locking in multithreaded situations. - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2008 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -71,7 +71,7 @@ # undef USE_PTH_THREADS # undef USE_WIN32_THREADS #endif -#include "lock.h" +#include "glthread/lock.h" #if ENABLE_DEBUGGING # define dbgprintf printf diff --git a/tests/test-tls.c b/tests/test-tls.c index 89107752a..83c4ffb16 100644 --- a/tests/test-tls.c +++ b/tests/test-tls.c @@ -1,5 +1,5 @@ /* Test of thread-local storage in multithreaded situations. - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2008 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -50,7 +50,7 @@ #include #include -#include "tls.h" +#include "glthread/tls.h" #if ENABLE_DEBUGGING # define dbgprintf printf -- 2.11.0