Re: checkin of glthread/glcond modules

[Bruno Haible]

Yoann Vandoorselaere wrote:
> >     Can you see alternatives? Maybe something like <glthread/lock.h>,
> >     <glthread/tls.h>, <glthread/thread.h>, <glthread/cond.h>,
> >     <glthread/yield.h> ?
> 
> Look good to me, can you handle the renaming part so that all the
> modules look consistant?

Done as follows:

2008-08-14  Bruno Haible  <address@hidden>

        * 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.

--- NEWS.orig   2008-08-14 10:56:06.000000000 +0200
+++ NEWS        2008-08-14 10:51:09.000000000 +0200
@@ -6,6 +6,11 @@
 
 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.
--- lib/fstrcmp.c.orig  2008-08-14 10:56:06.000000000 +0200
+++ lib/fstrcmp.c       2008-08-14 10:40:41.000000000 +0200
@@ -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 <stdlib.h>
 #include <limits.h>
 
-#include "lock.h"
-#include "tls.h"
+#include "glthread/lock.h"
+#include "glthread/tls.h"
 #include "minmax.h"
 #include "xalloc.h"
 
--- lib/strsignal.c.orig        2008-08-14 10:56:07.000000000 +0200
+++ lib/strsignal.c     2008-08-14 10:39:58.000000000 +0200
@@ -36,8 +36,8 @@
 #ifdef _LIBC
 # include <bits/libc-lock.h>
 #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
--- modules/lock.orig   2008-08-14 10:56:07.000000000 +0200
+++ modules/lock        2008-08-14 10:41:55.000000000 +0200
@@ -2,8 +2,8 @@
 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 @@
 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
--- modules/tls.orig    2008-08-14 10:56:07.000000000 +0200
+++ modules/tls 2008-08-14 10:42:39.000000000 +0200
@@ -2,8 +2,8 @@
 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 @@
 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+
--- tests/test-lock.c.orig      2008-08-14 10:56:07.000000000 +0200
+++ tests/test-lock.c   2008-08-14 10:47:12.000000000 +0200
@@ -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
--- tests/test-tls.c.orig       2008-08-14 10:56:07.000000000 +0200
+++ tests/test-tls.c    2008-08-14 10:47:19.000000000 +0200
@@ -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 <stdlib.h>
 #include <string.h>
 
-#include "tls.h"
+#include "glthread/tls.h"
 
 #if ENABLE_DEBUGGING
 # define dbgprintf printf