CVS commit: src/external/gpl2/lvm2/dist/lib/commands
Module Name:src
Committed By: joerg
Date: Sat Nov 15 01:24:38 UTC 2014
Modified Files:
src/external/gpl2/lvm2/dist/lib/commands: toolcontext.c
Log Message:
Comment out impossible code.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 \
src/external/gpl2/lvm2/dist/lib/commands/toolcontext.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl2/lvm2/dist/lib/commands/toolcontext.c
diff -u src/external/gpl2/lvm2/dist/lib/commands/toolcontext.c:1.7 src/external/gpl2/lvm2/dist/lib/commands/toolcontext.c:1.8
--- src/external/gpl2/lvm2/dist/lib/commands/toolcontext.c:1.7 Sat Dec 5 01:52:44 2009
+++ src/external/gpl2/lvm2/dist/lib/commands/toolcontext.c Sat Nov 15 01:24:38 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: toolcontext.c,v 1.7 2009/12/05 01:52:44 haad Exp $ */
+/* $NetBSD: toolcontext.c,v 1.8 2014/11/15 01:24:38 joerg Exp $ */
/*
* Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved.
@@ -992,12 +992,14 @@ static int _init_backup(struct cmd_conte
char default_dir[PATH_MAX];
const char *dir;
+#if 0
if (!cmd-system_dir) {
log_warn(WARNING: Metadata changes will NOT be backed up);
backup_init(cmd, , 0);
archive_init(cmd, , 0, 0, 0);
return 1;
}
+#endif
/* set up archiving */
cmd-default_settings.archive =
CVS commit: src/external/gpl2/lvm2/dist/lib/commands
Module Name:src
Committed By: haad
Date: Sat Dec 5 01:52:44 UTC 2009
Modified Files:
src/external/gpl2/lvm2/dist/lib/commands: toolcontext.c
Log Message:
Try to fix amd64 build.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
src/external/gpl2/lvm2/dist/lib/commands/toolcontext.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl2/lvm2/dist/lib/commands/toolcontext.c
diff -u src/external/gpl2/lvm2/dist/lib/commands/toolcontext.c:1.6 src/external/gpl2/lvm2/dist/lib/commands/toolcontext.c:1.7
--- src/external/gpl2/lvm2/dist/lib/commands/toolcontext.c:1.6 Wed Dec 2 01:53:25 2009
+++ src/external/gpl2/lvm2/dist/lib/commands/toolcontext.c Sat Dec 5 01:52:44 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: toolcontext.c,v 1.6 2009/12/02 01:53:25 haad Exp $ */
+/* $NetBSD: toolcontext.c,v 1.7 2009/12/05 01:52:44 haad Exp $ */
/*
* Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved.
@@ -845,13 +845,17 @@
return 1;
}
+#ifdef __NetBSD__
+#include dlfcn.h
+#endif
+
static int _init_single_segtype(struct cmd_context *cmd,
struct segtype_library *seglib)
{
struct segment_type *(*init_segtype_fn) (struct cmd_context *);
struct segment_type *segtype;
- if (!(init_segtype_fn = (void *) dlsym(seglib-lib, init_segtype))) {
+ if (!(init_segtype_fn = dlsym(seglib-lib, init_segtype))) {
log_error(Shared library %s does not contain segment type
functions, seglib-libname);
return 0;
