2005-03-24 Marcus Brinkmann <marcus@g10code.de>

	* io.h: Rename to ...
	* priv-io.h: ... this.
	* Makefile.am (libgpgme_real_la_SOURCES): Change io.h to priv-io.h.
	* data.c, engine-gpgsm.c, posix-io.c, rungpg.c, version.c,
	w32-io.c, wait-private.c, wait-global.c, wait-user.c, wait.c:
	Change all includes of "io.h" to "priv-io.h"

diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog
index 8ba7807b2123155b3a8c4e78a17dbc6858e9bf70..be433844c88bd2323b6224b5c41c61ec018078d3 100644 (file)
--- a/gpgme/ChangeLog
+++ b/gpgme/ChangeLog
@@ -1,3 +1,12 @@
+2005-03-24  Marcus Brinkmann  <marcus@g10code.de>
+
+       * io.h: Rename to ...
+       * priv-io.h: ... this.
+       * Makefile.am (libgpgme_real_la_SOURCES): Change io.h to priv-io.h.
+       * data.c, engine-gpgsm.c, posix-io.c, rungpg.c, version.c,
+       w32-io.c, wait-private.c, wait-global.c, wait-user.c, wait.c:
+       Change all includes of "io.h" to "priv-io.h"
+       
 2005-03-09  Werner Koch  <wk@g10code.com>
 
        * w32-util.c (_gpgme_get_gpg_path, _gpgme_get_gpgsm_path): Do not

diff --git a/gpgme/Makefile.am b/gpgme/Makefile.am
index b2147d963ac53e47bb574fcde19fa4d0281cb103..90751e6e2c5a7120825e624b20a73757ee912ee7 100644 (file)
--- a/gpgme/Makefile.am
+++ b/gpgme/Makefile.am
@@ -1,5 +1,5 @@
 # Copyright (C) 2000 Werner Koch (dd9jn)
-# Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH
+# Copyright (C) 2001, 2002, 2003, 2004, 2005 g10 Code GmbH
 # 
 # This file is part of GPGME.
 # 
@@ -79,7 +79,7 @@ libgpgme_real_la_SOURCES =                                            \
        key.c keylist.c trust-item.c trustlist.c                        \
        import.c export.c genkey.c delete.c edit.c                      \
        engine.h engine-backend.h engine.c rungpg.c status-table.h      \
-       $(gpgsm_components) sema.h io.h $(system_components)            \
+       $(gpgsm_components) sema.h priv-io.h $(system_components)       \
        debug.c debug.h gpgme.c version.c error.c
 
 # libgpgme_la_SOURCES = ath.h ath.c

diff --git a/gpgme/data.c b/gpgme/data.c
index d4bac06bc85ebeab099fbbae4a20401a48c0d0c0..39f60af31efc46431049f0960122305f5a4ba457 100644 (file)
--- a/gpgme/data.c
+++ b/gpgme/data.c
@@ -1,5 +1,5 @@
 /* data.c - An abstraction for data objects.
-   Copyright (C) 2002, 2003, 2004 g10 Code GmbH
+   Copyright (C) 2002, 2003, 2004, 2005 g10 Code GmbH
 
    This file is part of GPGME.
  
@@ -31,7 +31,7 @@
 #include "data.h"
 #include "util.h"
 #include "ops.h"
-#include "io.h"
+#include "priv-io.h"
 
 #if defined(HAVE_W32_SYSTEM) && !defined(EOPNOTSUPP)
 #define EOPNOTSUPP VALUE_FOR_EOPNOTSUPP

diff --git a/gpgme/engine-gpgsm.c b/gpgme/engine-gpgsm.c
index c35087bb2efc58a6adc3f4f762f260230619cb55..ea6ccc74c4de093c0b40404275c76542c5bbadd8 100644 (file)
--- a/gpgme/engine-gpgsm.c
+++ b/gpgme/engine-gpgsm.c
@@ -1,6 +1,6 @@
 /* engine-gpgsm.c - GpgSM engine.
    Copyright (C) 2000 Werner Koch (dd9jn)
-   Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH
+   Copyright (C) 2001, 2002, 2003, 2004, 2005 g10 Code GmbH
  
    This file is part of GPGME.
 
@@ -38,7 +38,7 @@
 #include "util.h"
 #include "ops.h"
 #include "wait.h"
-#include "io.h"
+#include "priv-io.h"
 #include "sema.h"
 
 #include "assuan.h"

diff --git a/gpgme/posix-io.c b/gpgme/posix-io.c
index 3e85bfa43741aa6b2cceb773d9a7ca5f58e1d16d..d4289846be3120d9025cd6f04c084e0856e8b993 100644 (file)
--- a/gpgme/posix-io.c
+++ b/gpgme/posix-io.c
@@ -1,6 +1,6 @@
 /* posix-io.c - Posix I/O functions
    Copyright (C) 2000 Werner Koch (dd9jn)
-   Copyright (C) 2001, 2002, 2004 g10 Code GmbH
+   Copyright (C) 2001, 2002, 2004, 2005 g10 Code GmbH
 
    This file is part of GPGME.
  
@@ -35,7 +35,7 @@
 #include <sys/wait.h>
 
 #include "util.h"
-#include "io.h"
+#include "priv-io.h"
 #include "sema.h"
 #include "ath.h"
 #include "debug.h"

diff --git a/gpgme/io.h b/gpgme/priv-io.h
similarity index 94%
rename from gpgme/io.h
rename to gpgme/priv-io.h
index 47707017e0231ca3c61e742157f5d53423a42ca0..3a7150c3c3dfc8597efcbedbb78743727eab6aa2 100644 (file)
--- a/gpgme/io.h
+++ b/gpgme/priv-io.h
@@ -1,6 +1,6 @@
-/* io.h - Interface to the I/O functions.
+/* priv-io.h - Interface to the private I/O functions.
    Copyright (C) 2000 Werner Koch (dd9jn)
-   Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH
+   Copyright (C) 2001, 2002, 2003, 2004, 2005 g10 Code GmbH
 
    This file is part of GPGME.
  

diff --git a/gpgme/rungpg.c b/gpgme/rungpg.c
index 0667f863775af86808a7e81a5d66dc0c9dbd682e..0d728fee40bd796ff76a07e826b817f5a41a96ba 100644 (file)
--- a/gpgme/rungpg.c
+++ b/gpgme/rungpg.c
@@ -1,6 +1,6 @@
 /* rungpg.c - Gpg Engine.
    Copyright (C) 2000 Werner Koch (dd9jn)
-   Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH
+   Copyright (C) 2001, 2002, 2003, 2004, 2005 g10 Code GmbH
  
    This file is part of GPGME.
  
@@ -33,7 +33,7 @@
 #include "ops.h"
 #include "wait.h"
 #include "context.h"  /*temp hack until we have GpmeData methods to do I/O */
-#include "io.h"
+#include "priv-io.h"
 #include "sema.h"
 #include "debug.h"
 

diff --git a/gpgme/version.c b/gpgme/version.c
index d1d2c2f5299f730db7b20ac6cd267766a4034dda..f417f9c8e1c03250319e79d7fbb1d7e5e8f0769b 100644 (file)
--- a/gpgme/version.c
+++ b/gpgme/version.c
@@ -1,6 +1,6 @@
 /* version.c - Version check routines.
    Copyright (C) 2000 Werner Koch (dd9jn)
-   Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH
+   Copyright (C) 2001, 2002, 2003, 2004, 2005 g10 Code GmbH
  
    This file is part of GPGME.
  
@@ -27,7 +27,7 @@
 #include <ctype.h>
 
 #include "gpgme.h"
-#include "io.h"
+#include "priv-io.h"
 
 /* For _gpgme_sema_subsystem_init ().  */
 #include "sema.h"

diff --git a/gpgme/w32-io.c b/gpgme/w32-io.c
index 7defc3cc68027e9c8ac511a7105e4b717bb181f6..4e62aaf18377905822c8aea068df1bc3d0ca0883 100644 (file)
--- a/gpgme/w32-io.c
+++ b/gpgme/w32-io.c
@@ -36,7 +36,7 @@
 
 #include "util.h"
 #include "sema.h"
-#include "io.h"
+#include "priv-io.h"
 #include "debug.h"
 
 /* We assume that a HANDLE can be represented by an int which should

diff --git a/gpgme/wait-global.c b/gpgme/wait-global.c
index 6d75d3d1c10c09c28c8bb4a6262050f4f571b0af..17e57ddb1b805b0ba4e61f507260fe24d110667f 100644 (file)
--- a/gpgme/wait-global.c
+++ b/gpgme/wait-global.c
@@ -1,6 +1,6 @@
 /* wait-global.c 
    Copyright (C) 2000 Werner Koch (dd9jn)
-   Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH
+   Copyright (C) 2001, 2002, 2003, 2004, 2005 g10 Code GmbH
  
    This file is part of GPGME.
  
@@ -32,7 +32,7 @@
 #include "util.h"
 #include "context.h"
 #include "wait.h"
-#include "io.h"
+#include "priv-io.h"
 
 /* The global event loop is used for all asynchronous operations
    (except key listing) for which no user I/O callbacks are specified.

diff --git a/gpgme/wait-private.c b/gpgme/wait-private.c
index 166b7132e60fa4626e7c4cbf464519d4a95f82fd..f883f2064627bfd98447a04f810a52b6ac272377 100644 (file)
--- a/gpgme/wait-private.c
+++ b/gpgme/wait-private.c
@@ -1,6 +1,6 @@
 /* wait-private.c 
    Copyright (C) 2000 Werner Koch (dd9jn)
-   Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH
+   Copyright (C) 2001, 2002, 2003, 2004, 2005 g10 Code GmbH
  
    This file is part of GPGME.
  
@@ -29,7 +29,7 @@
 #include "context.h"
 #include "wait.h"
 #include "ops.h"
-#include "io.h"
+#include "priv-io.h"
 #include "util.h"
 
 \f

diff --git a/gpgme/wait-user.c b/gpgme/wait-user.c
index 3800b4f48de75f7acec2c859cfc60552a66b7592..0f046f2eb7965846fbcd655ad5057c56a3f8b103 100644 (file)
--- a/gpgme/wait-user.c
+++ b/gpgme/wait-user.c
@@ -1,6 +1,6 @@
 /* wait-user.c 
    Copyright (C) 2000 Werner Koch (dd9jn)
-   Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH
+   Copyright (C) 2001, 2002, 2003, 2004, 2005 g10 Code GmbH
  
    This file is part of GPGME.
  
@@ -26,7 +26,7 @@
 
 #include "gpgme.h"
 #include "context.h"
-#include "io.h"
+#include "priv-io.h"
 #include "wait.h"
 
 \f

diff --git a/gpgme/wait.c b/gpgme/wait.c
index f3cc8f68701e1d57984e6713cdb5ee5b51926178..4d3cbf841171a47f8261f61c53d3f7016441ec82 100644 (file)
--- a/gpgme/wait.c
+++ b/gpgme/wait.c
@@ -1,6 +1,6 @@
 /* wait.c 
    Copyright (C) 2000 Werner Koch (dd9jn)
-   Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH
+   Copyright (C) 2001, 2002, 2003, 2004, 2005 g10 Code GmbH
  
    This file is part of GPGME.
  
@@ -33,7 +33,7 @@
 #include "ops.h"
 #include "wait.h"
 #include "sema.h"
-#include "io.h"
+#include "priv-io.h"
 #include "engine.h"
 #include "debug.h"