From: George Kadianakis <desnacked@riseup.net>
Date: Thu, 5 Sep 2019 14:12:19 +0000 (+0300)
Subject: Merge branch 'tor-github/pr/1294'
X-Git-Tag: tor-0.4.2.1-alpha~33
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ddd01541b909a84396e2d9ba31266ae63670c938;p=thirdparty%2Ftor.git

Merge branch 'tor-github/pr/1294'
---

ddd01541b909a84396e2d9ba31266ae63670c938
diff --cc src/lib/conf/conftypes.h
index 612272e453,3db115204b..4609564b34
--- a/src/lib/conf/conftypes.h
+++ b/src/lib/conf/conftypes.h
@@@ -122,9 -100,13 +122,13 @@@ typedef struct struct_member_t 
   * that they have the correct type.
   */
  typedef struct struct_magic_decl_t {
+   /** The name of the structure */
    const char *typename;
+   /** A value used to recognize instances of this structure. */
    uint32_t magic_val;
+   /** The location within the structure at which we expect to find
+    * <b>magic_val</b>. */
 -  int magic_offset;
 +  ptrdiff_t magic_offset;
  } struct_magic_decl_t;
  
  /**