more compact indentation spec

skeletons/asn_internal.h

@@ -28,6 +28,9 @@ int get_asn1c_environment_version(void);	/* Run-time version */
 #define	REALLOC(oldptr, size)	realloc(oldptr, size)
 #define	FREEMEM(ptr)		free(ptr)
 
+#define	asn_debug_indent	0
+#define ASN_DEBUG_INDENT_ADD(i) do{}while(0)
+
 /*
  * A macro for debugging the ASN.1 internals.
  * You may enable or override it.
@@ -36,9 +39,11 @@ int get_asn1c_environment_version(void);	/* Run-time version */
 #if	EMIT_ASN_DEBUG == 1	/* And it was asked to emit this code... */
 #ifdef	__GNUC__
 #ifdef	ASN_THREAD_SAFE
-#define	asn_debug_indent	0
-#define ASN_DEBUG_INDENT_ADD(i) do{}while(0)
+/* Thread safety requires sacrifice in output indentation:
+ * Retain empty definition of ASN_DEBUG_INDENT_ADD. */
 #else	/* !ASN_THREAD_SAFE */
+#undef  ASN_DEBUG_INDENT_ADD
+#undef  asn_debug_indent
 int asn_debug_indent;
 #define ASN_DEBUG_INDENT_ADD(i) do { asn_debug_indent += i; } while(0)
 #endif	/* ASN_THREAD_SAFE */

skeletons/per_opentype.c

@@ -7,16 +7,6 @@
 #include <constr_TYPE.h>
 #include <per_opentype.h>
 
-/* Thread safety requires sacrifice in output indentation. */
-#ifndef ASN_DEBUG_INDENT_ADD
-#ifdef  ASN_THREAD_SAFE
-#define ASN_DEBUG_INDENT_ADD(i) do{}while(0)
-#else   /* !ASN_THREAD_SAFE */
-int asn_debug_indent;
-#define ASN_DEBUG_INDENT_ADD(i) do { asn_debug_indent += i; } while(0)
-#endif  /* ASN_THREAD_SAFE */
-#endif  /* ASN_DEBUG_INDENT_ADD */
-
 typedef struct uper_ugot_key {
 	asn_per_data_t oldpd;	/* Old per data source */
 	size_t unclaimed;