[nas] [patch] remove/simplify _AuConst

Stefan Huehner stefan at huehner.org
Tue Aug 29 08:01:24 MDT 2006


Hi,

attached patch changes all of the conditional i.e. _AuConst definitions
to only list const in the externally visible header files. This is to
preserve compatibility if someone uses these definitions while using the
libaudio library. Imho we should officially deprecate this usaeg
somewhere in the documentation and remove these definitions altogether
after the next release.

Is this procedure ok?

The internal usage of these defines will be removed in an follow up
patch.

Regards,
Stefan
-------------- next part --------------
Index: lib/audio/Afuncproto.h
===================================================================
--- lib/audio/Afuncproto.h	(revision 224)
+++ lib/audio/Afuncproto.h	(working copy)
@@ -45,11 +45,7 @@
 #define _AUFUNCPROTO_H_
 
 #ifndef _AuConst
-#if __STDC__ || defined(__cplusplus) || defined(c_plusplus) || (FUNCPROTO&4)
 #define _AuConst const
-#else
-#define _AuConst /**/
-#endif
 #endif /* _AuConst */
 
 
Index: lib/audio/8svx.h
===================================================================
--- lib/audio/8svx.h	(revision 224)
+++ lib/audio/8svx.h	(working copy)
@@ -27,17 +27,8 @@
 
 #include <audio/audio.h>			/* for AuInt32 and AuUint32 */
 
-/*
- * If we are being used outside the NCD-AUDIO sound library, then we'll need
- * some ANSIfication definitions.
- */
-
 #ifndef _SvxConst
-#if __STDC__ || defined(__cplusplus) || defined(c_plusplus) || (FUNCPROTO&4)
 #define _SvxConst const
-#else
-#define _SvxConst				/**/
-#endif
 #endif						/* _SvxConst */
 
 #ifndef _FUNCPROTOBEGIN
Index: lib/audio/fileutil.h
===================================================================
--- lib/audio/fileutil.h	(revision 224)
+++ lib/audio/fileutil.h	(working copy)
@@ -27,17 +27,8 @@
 
 #include <audio/audio.h>	/* for AuInt32 and AuUint32 */
 
-/*
- * If we are being used outside the NCD-AUDIO sound library, then we'll need
- * some ANSIfication definitions.
- */
-
 #ifndef _FileConst
-#if __STDC__ || defined(__cplusplus) || defined(c_plusplus) || (FUNCPROTO&4)
 #define _FileConst const
-#else
-#define _FileConst		/**/
-#endif
 #endif				/* _FileConst */
 
 #ifndef _FUNCPROTOBEGIN
Index: lib/audio/aiff.h
===================================================================
--- lib/audio/aiff.h	(revision 224)
+++ lib/audio/aiff.h	(working copy)
@@ -27,17 +27,8 @@
 
 #include <audio/audio.h>	/* for AuInt32 and AuUint32 */
 
-/*
- * If we are being used outside the NCD-AUDIO sound library, then we'll need
- * some ANSIfication definitions.
- */
-
 #ifndef _AiffConst
-#if __STDC__ || defined(__cplusplus) || defined(c_plusplus) || (FUNCPROTO&4)
 #define _AiffConst const
-#else
-#define _AiffConst				/**/
-#endif
 #endif						/* _AiffConst */
 
 #ifndef _FUNCPROTOBEGIN


More information about the Nas mailing list