2005-03-24 Marcus Brinkmann <[email protected]>

	* 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"

13 files changed, 32 insertions, 23 deletions

diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog
index 8ba7807b..be433844 100644
--- a/gpgme/ChangeLog
+++ b/gpgme/ChangeLog
@@ -1,3 +1,12 @@
+2005-03-24  Marcus Brinkmann  <[email protected]>
+
+	* 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  <[email protected]>
 
 	* w32-util.c (_gpgme_get_gpg_path, _gpgme_get_gpgsm_path): Do not
diff --git a/gpgme/Makefile.am b/gpgme/Makefile.am
index b2147d96..90751e6e 100644
--- 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 d4bac06b..39f60af3 100644
--- 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 c35087bb..ea6ccc74 100644
--- 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 3e85bfa4..d4289846 100644
--- 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
index 47707017..3a7150c3 100644
--- 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 0667f863..0d728fee 100644
--- 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 d1d2c2f5..f417f9c8 100644
--- 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 7defc3cc..4e62aaf1 100644
--- 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 6d75d3d1..17e57ddb 100644
--- 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 166b7132..f883f206 100644
--- 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"
 
 
diff --git a/gpgme/wait-user.c b/gpgme/wait-user.c
index 3800b4f4..0f046f2e 100644
--- 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"
 
 
diff --git a/gpgme/wait.c b/gpgme/wait.c
index f3cc8f68..4d3cbf84 100644
--- 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"