From 69dca3a4f45e0ec98f2d28b91711e8d72b86dc26 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Sun, 3 Feb 2013 15:02:31 +0100 Subject: [PATCH 1/2] openbsd: Add minor number to shared library install name This is what the OpenBSD porter's manual describes as correct, cf. http://www.openbsd.org/faq/ports/specialtopics.html#SharedLibs --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index 0731c27ec9..453d25c163 100755 --- a/configure +++ b/configure @@ -2860,7 +2860,7 @@ case $target_os in openbsd|bitrig) disable symver SHFLAGS='-shared' - SLIBNAME_WITH_MAJOR='$(SLIBNAME).$(LIBVERSION)' + SLIB_INSTALL_NAME='$(SLIBNAME).$(LIBMAJOR).$(LIBMINOR)' SLIB_INSTALL_LINKS= oss_indev_extralibs="-lossaudio" oss_outdev_extralibs="-lossaudio" From 56dea32f09e71460add14a1b6d0fbe6eb16f02a4 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Mon, 11 Feb 2013 18:39:12 +0100 Subject: [PATCH 2/2] doc: developer: Fix wording in "naming conventions" section --- doc/developer.texi | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/doc/developer.texi b/doc/developer.texi index a377ed1188..b3e151347e 100644 --- a/doc/developer.texi +++ b/doc/developer.texi @@ -178,27 +178,26 @@ GCC statement expressions (@samp{(x = (@{ int y = 4; y; @})}). @end itemize @subsection Naming conventions -All names are using underscores (_), not CamelCase. For example, -@samp{avfilter_get_video_buffer} is a valid function name and -@samp{AVFilterGetVideo} is not. The only exception from this are structure -names; they should always be in the CamelCase +All names should be composed with underscores (_), not CamelCase. For example, +@samp{avfilter_get_video_buffer} is an acceptable function name and +@samp{AVFilterGetVideo} is not. The only exception are structure +names; they should always be CamelCase. -There are following conventions for naming variables and functions: +There are the following conventions for naming variables and functions: @itemize @bullet @item For local variables no prefix is required. @item -For variables and functions declared as @code{static} no prefixes are required. +For variables and functions declared as @code{static} no prefix is required. @item -For variables and functions used internally by the library, @code{ff_} prefix -should be used. -For example, @samp{ff_w64_demuxer}. +For variables and functions used internally by a library an @code{ff_} +prefix should be used, e.g. @samp{ff_w64_demuxer}. @item For variables and functions used internally across multiple libraries, use @code{avpriv_}. For example, @samp{avpriv_aac_parse_header}. @item -For exported names, each library has its own prefixes. Just check the existing -code and name accordingly. +For externally visible symbols, each library has its own prefix. Check +the existing code and choose names accordingly. @end itemize @subsection Miscellaneous conventions