]>
Commit | Line | Data |
---|---|---|
97e01337 ER |
1 | --- nss_db-2.2.3pre1/db-XXX.c.orig 2001-04-30 03:07:41.000000000 +0200 |
2 | +++ nss_db-2.2.3pre1/db-XXX.c 2004-04-02 23:51:28.467862480 +0200 | |
b9e66661 JB |
3 | @@ -24,7 +24,7 @@ |
4 | #include <stdio.h> | |
5 | #include <string.h> | |
6 | ||
7 | -#include <bits/libc-lock.h> | |
8 | +#include "libc-lock.h" | |
9 | ||
10 | #include "nss_db.h" | |
11 | ||
97e01337 ER |
12 | --- nss_db-2.2.3pre1/db-alias.c.orig 2001-04-30 03:07:41.000000000 +0200 |
13 | +++ nss_db-2.2.3pre1/db-alias.c 2004-04-02 23:51:43.827527456 +0200 | |
b9e66661 JB |
14 | @@ -26,7 +26,7 @@ |
15 | #include <stdio.h> | |
16 | #include <string.h> | |
17 | ||
18 | -#include <bits/libc-lock.h> | |
19 | +#include "libc-lock.h" | |
20 | ||
21 | #include "nss_db.h" | |
22 | ||
97e01337 ER |
23 | --- nss_db-2.2.3pre1/db-netgrp.c.orig 2001-04-30 03:07:41.000000000 +0200 |
24 | +++ nss_db-2.2.3pre1/db-netgrp.c 2004-04-02 23:51:55.586739784 +0200 | |
b9e66661 JB |
25 | @@ -22,7 +22,7 @@ |
26 | #include <fcntl.h> | |
27 | #include <netgroup.h> | |
28 | #include <string.h> | |
29 | -#include <bits/libc-lock.h> | |
30 | +#include "libc-lock.h" | |
31 | #include <paths.h> | |
32 | ||
33 | #include "nss_db.h" | |
97e01337 ER |
34 | --- nss_db-2.2.3pre1/Makefile.am.orig 2004-04-02 23:46:06.000000000 +0200 |
35 | +++ nss_db-2.2.3pre1/Makefile.am 2004-04-02 23:54:15.053537608 +0200 | |
b9e66661 JB |
36 | @@ -11,7 +11,7 @@ |
37 | ||
38 | noinst_HEADERS = db-compat.h netgroup.h nss_db.h | |
39 | ||
40 | -INCLUDES = @DB_CFLAGS@ -D_LIBC -D_GNU_SOURCE \ | |
41 | +INCLUDES = @DB_CFLAGS@ -D_GNU_SOURCE \ | |
42 | -I../intl -DLOCALEDIR=\"$(localedir)\" | |
43 | ||
44 | EXTRA_DIST = libnss_db.map | |
45 | @@ -25,7 +25,7 @@ | |
46 | libnss_db_la_LDFLAGS = -version-info $(INTERFACE) \ | |
47 | -Wl,--version-script=$(srcdir)/libnss_db.map | |
48 | libnss_db_la_DEPENDENCIES = libnss_db.map | |
49 | -libnss_db_la_LIBADD = @DB_LIBS@ -lnss_files | |
50 | +libnss_db_la_LIBADD = @DB_LIBS@ $(slibdir)/libnss_files.so.2 | |
51 | ||
52 | bin_PROGRAMS = makedb | |
53 | makedb_SOURCES = makedb.c | |
97e01337 ER |
54 | --- nss_db-2.2.3pre1/libc-lock.h.orig 1970-01-01 01:00:00.000000000 +0100 |
55 | +++ nss_db-2.2.3pre1/libc-lock.h 2004-04-02 23:53:23.534369712 +0200 | |
b9e66661 JB |
56 | @@ -0,0 +1,43 @@ |
57 | +/* libc-internal interface for mutex locks. LinuxThreads version. | |
58 | + Adapted for nss_db. | |
59 | + Copyright (C) 1996,1997,1998,1999,2000,2001,2002 | |
60 | + Free Software Foundation, Inc. | |
61 | + This file is part of the GNU C Library. | |
62 | + | |
63 | + The GNU C Library is free software; you can redistribute it and/or | |
64 | + modify it under the terms of the GNU Lesser General Public License as | |
65 | + published by the Free Software Foundation; either version 2.1 of the | |
66 | + License, or (at your option) any later version. | |
67 | + | |
68 | + The GNU C Library is distributed in the hope that it will be useful, | |
69 | + but WITHOUT ANY WARRANTY; without even the implied warranty of | |
70 | + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
71 | + Lesser General Public License for more details. | |
72 | + | |
73 | + You should have received a copy of the GNU Lesser General Public | |
74 | + License along with the GNU C Library; see the file COPYING.LIB. If not, | |
75 | + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
76 | + Boston, MA 02111-1307, USA. */ | |
77 | + | |
78 | +#ifndef LIBC_LOCK_H | |
79 | +#define LIBC_LOCK_H | |
80 | + | |
81 | +#include <pthread.h> | |
82 | + | |
83 | +typedef pthread_mutex_t __libc_lock_t; | |
84 | + | |
85 | +#if __LT_SPINLOCK_INIT == 0 | |
86 | +# define __libc_lock_define_initialized(CLASS,NAME) \ | |
87 | + CLASS pthread_mutex_t NAME; | |
88 | +#else | |
89 | +# define __libc_lock_define_initialized(CLASS,NAME) \ | |
90 | + CLASS pthread_mutex_t NAME = PTHREAD_MUTEX_INITIALIZER; | |
91 | +#endif | |
92 | + | |
93 | +/* Lock the named lock variable. */ | |
94 | +#define __libc_lock_lock(NAME) pthread_mutex_lock (&(NAME)); | |
95 | + | |
96 | +/* Unlock the named lock variable. */ | |
97 | +#define __libc_lock_unlock(NAME) pthread_mutex_unlock (&(NAME)); | |
98 | + | |
99 | +#endif /* bits/libc-lock.h */ |