summaryrefslogtreecommitdiffstats
path: root/libtdenetwork
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-17 12:20:51 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-17 12:20:51 -0600
commit00260fbb76eae21106094be8736ef0f1dabde387 (patch)
tree31d5a2a1a3b9944ac9e06d523be381c2b832a421 /libtdenetwork
parentda6f54f964c028f12c91450617d72451b1cd8e2c (diff)
parentb8daa96e4476854dcaf58a8bcc2c3d09de8f0d54 (diff)
downloadtdepim-00260fbb76eae21106094be8736ef0f1dabde387.tar.gz
tdepim-00260fbb76eae21106094be8736ef0f1dabde387.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdepim
Diffstat (limited to 'libtdenetwork')
-rw-r--r--libtdenetwork/libgpgme-copy/assuan/assuan-logging.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/libtdenetwork/libgpgme-copy/assuan/assuan-logging.c b/libtdenetwork/libgpgme-copy/assuan/assuan-logging.c
index 6642f8510..cfc3d846f 100644
--- a/libtdenetwork/libgpgme-copy/assuan/assuan-logging.c
+++ b/libtdenetwork/libgpgme-copy/assuan/assuan-logging.c
@@ -137,7 +137,7 @@ _assuan_log_print_buffer (FILE *fp, const void *buffer, size_t length)
fwrite (buffer, length, 1, fp);
else
{
-#ifdef HAVE_FLOCTDEFILE
+#ifdef HAVE_FLOCKFILE
flockfile (fp);
#endif
putc_unlocked ('[', fp);
@@ -154,7 +154,7 @@ _assuan_log_print_buffer (FILE *fp, const void *buffer, size_t length)
}
putc_unlocked (' ', fp);
putc_unlocked (']', fp);
-#ifdef HAVE_FUNLOCTDEFILE
+#ifdef HAVE_FUNLOCKFILE
funlockfile (fp);
#endif
}
@@ -171,7 +171,7 @@ _assuan_log_sanitized_string (const char *string)
if (! *s)
return;
-#ifdef HAVE_FLOCTDEFILE
+#ifdef HAVE_FLOCKFILE
flockfile (fp);
#endif
@@ -218,7 +218,7 @@ _assuan_log_sanitized_string (const char *string)
}
}
-#ifdef HAVE_FUNLOCTDEFILE
+#ifdef HAVE_FUNLOCKFILE
funlockfile (fp);
#endif
}