aboutsummaryrefslogtreecommitdiffstats
path: root/util
diff options
context:
space:
mode:
Diffstat (limited to 'util')
-rw-r--r--util/ChangeLog4
-rw-r--r--util/Makefile.am6
-rw-r--r--util/w32reg.c2
3 files changed, 8 insertions, 4 deletions
diff --git a/util/ChangeLog b/util/ChangeLog
index 965bc71a0..531de7c02 100644
--- a/util/ChangeLog
+++ b/util/ChangeLog
@@ -1,3 +1,7 @@
+Sat Oct 9 20:34:41 CEST 1999 Werner Koch <[email protected]>
+
+ * Makefile.am: Removed libtool.
+
Fri Oct 8 20:32:01 CEST 1999 Werner Koch <[email protected]>
* w32reg.c: New.
diff --git a/util/Makefile.am b/util/Makefile.am
index 3098ba671..5870fb6a9 100644
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -2,11 +2,11 @@
INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/intl
-noinst_LTLIBRARIES = libutil.la
+noinst_LIBRARIES = libutil.a
-libutil_la_LDFLAGS =
-libutil_la_SOURCES = g10u.c logger.c fileutil.c miscutil.c strgutil.c \
+#libutil_a_LDFLAGS =
+libutil_a_SOURCES = g10u.c logger.c fileutil.c miscutil.c strgutil.c \
ttyio.c argparse.c memory.c secmem.c errors.c iobuf.c \
dotlock.c http.c simple-gettext.c w32reg.c
diff --git a/util/w32reg.c b/util/w32reg.c
index 01ca5df89..0cf38090f 100644
--- a/util/w32reg.c
+++ b/util/w32reg.c
@@ -71,7 +71,7 @@ read_w32_registry_string( const char *root, const char *dir, const char *name )
if( !result )
goto leave;
if( RegQueryValueEx( key_handle, name, 0, NULL, result, &n1 ) ) {
- m_free(result); result = NULL;
+ free(result); result = NULL;
goto leave;
}
result[nbytes] = 0; /* make sure it is really a string */