# HG changeset patch # User mru # Date 1268083738 0 # Node ID 9b3647b95b1402792a859b7c3dfcd073a3fe7801 # Parent efba70214ef16b9cd2f914058dcfc41f64706ca3 Merge two adjacent ifdef blocks diff -r efba70214ef1 -r 9b3647b95b14 common.h --- a/common.h Mon Mar 08 21:28:56 2010 +0000 +++ b/common.h Mon Mar 08 21:28:58 2010 +0000 @@ -38,9 +38,6 @@ #ifdef HAVE_AV_CONFIG_H #include "config.h" -#endif - -#ifdef HAVE_AV_CONFIG_H # include "intmath.h" #endif