See ChangeLog: Fri Jul 14 19:38:23 CEST 2000 Werner Koch

6 files changed, 27 insertions, 4 deletions

diff --git a/include/ChangeLog b/include/ChangeLog
index dc8e6fbc1..addfc24a2 100644
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,13 @@
+Fri Jul 14 19:38:23 CEST 2000  Werner Koch  <wk@>
+
+  * http.h (HTTP_FLAG_TRY_PROXY): new.
+
+  * error.h (G10ERR_NOT_PROCESSED): New.
+
+  * iobuf.h (IOBUFCTRL_CANCEL): New.
+
+  * types.h (HAVE_U64_TYPEDEF): Defined depending on configure test.
+
 Thu Jan 27 18:00:44 CET 2000  Werner Koch  <[email protected]>
 
 	* Changed all "g10_"/"GPG_" prefixes to "gpg_"/"GPG_".
diff --git a/include/errors.h b/include/errors.h
index cb60e7dae..9fbf9320e 100644
--- a/include/errors.h
+++ b/include/errors.h
@@ -1,5 +1,5 @@
-/* errors.h - erro code
- *	Copyright (C) 1998 Free Software Foundation, Inc.
+/* errors.h - error codes fro GnuPG
+ *	Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
  *
  * This file is part of GNUPG.
  *
@@ -74,6 +74,7 @@
 #define GPGERR_UNKNOWN_HOST    149
 #define GPGERR_SELFTEST_FAILED	50
 #define GPGERR_NOT_ENCRYPTED   151
+#define GPGERR_NOT_PROCESSED   152
 
 #ifndef HAVE_STRERROR
 char *strerror( int n );
diff --git a/include/http.h b/include/http.h
index e644a1b11..a1d70406f 100644
--- a/include/http.h
+++ b/include/http.h
@@ -49,6 +49,10 @@ typedef enum {
     HTTP_REQ_POST = 3
 } HTTP_REQ_TYPE;
 
+enum {	/* put flag values into an enum, so that gdb can display them */
+    HTTP_FLAG_TRY_PROXY = 1
+};
+
 struct http_context {
     int initialized;
     unsigned int status_code;
@@ -60,7 +64,8 @@ struct http_context {
     PARSED_URI uri;
     HTTP_REQ_TYPE req_type;
     byte *buffer;	   /* line buffer */
-    unsigned buffer_size;
+    unsigned int buffer_size;
+    unsigned int flags;
 };
 typedef struct http_context *HTTP_HD;
 
diff --git a/include/iobuf.h b/include/iobuf.h
index cbbb74133..7a7d825e6 100644
--- a/include/iobuf.h
+++ b/include/iobuf.h
@@ -32,6 +32,7 @@
 #define IOBUFCTRL_UNDERFLOW 3
 #define IOBUFCTRL_FLUSH     4
 #define IOBUFCTRL_DESC	    5
+#define IOBUFCTRL_CANCEL    6
 #define IOBUFCTRL_USER	    16
 
 typedef struct iobuf_struct *IOBUF;
diff --git a/include/types.h b/include/types.h
index 6e12c3406..baece0bca 100644
--- a/include/types.h
+++ b/include/types.h
@@ -83,6 +83,11 @@
   #define HAVE_U32_TYPEDEF
 #endif
 
+/****************
+ * Warning: Some systems segfault when this u64 typedef and
+ * the dummy code in cipher/md.c is not available.  Examples are
+ * Solaris and IRIX.
+ */
 #ifndef HAVE_U64_TYPEDEF
   #undef u64	    /* maybe there is a macro with this name */
   #if SIZEOF_UNSIGNED_INT == 8
@@ -91,7 +96,7 @@
   #elif SIZEOF_UNSIGNED_LONG == 8
     typedef unsigned long u64;
     #define HAVE_U64_TYPEDEF
-  #elif __GNUC__ >= 2 || defined(__SUNPRO_C)
+  #elif SIZEOF_UNSIGNED_LONG_LONG == 8
     typedef unsigned long long u64;
     #define HAVE_U64_TYPEDEF
   #endif
diff --git a/include/util.h b/include/util.h
index a95b42c7b..375204e78 100644
--- a/include/util.h
+++ b/include/util.h
@@ -40,6 +40,7 @@ void gpg_log_print_prefix(const char *text);
 void log_set_name( const char *name );
 const char *log_get_name(void);
 void log_set_pid( int pid );
+void log_inc_errorcount(void);
 int  log_get_errorcount( int clear );
 void gpg_log_hexdump( const char *text, const char *buf, size_t len );