Wait to include system headers until we know they are wanted.

When building in the Linux kernel, __UD_STANDALONE__ is not defined
until types.h is included.  So we should wait to include system
headers like <stdlib.h> and <string.h> until we know __UD_STANDALONE__
will not be defined.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>

diff --git a/libudis86/decode.c b/libudis86/decode.c
index 90f6c052571f9a082a8eb09a3036011038f8e3fb..3af2f7d74458a8ef1ced5575553ed3036e55e101 100644 (file)
--- a/libudis86/decode.c
+++ b/libudis86/decode.c
@@ -23,15 +23,16 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-#ifndef __UD_STANDALONE__
-# include <string.h>
-#endif /* __UD_STANDALONE__ */
 
 #include "types.h"
 #include "itab.h"
 #include "input.h"
 #include "decode.h"
 
+#ifndef __UD_STANDALONE__
+# include <string.h>
+#endif /* __UD_STANDALONE__ */
+
 /* The max number of prefixes to an instruction */
 #define MAX_PREFIXES    15
 

diff --git a/libudis86/udis86.c b/libudis86/udis86.c
index 135ef5995ad4af090d9146b9a3105425addda0e8..942186344c34df99e6c16ed0721c6b67d0f965e4 100644 (file)
--- a/libudis86/udis86.c
+++ b/libudis86/udis86.c
@@ -23,14 +23,15 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-#ifndef __UD_STANDALONE__
-#include <stdlib.h>
-#include <string.h>
-#endif /* __UD_STANDALONE__ */
 
 #include "input.h"
 #include "extern.h"
 
+#ifndef __UD_STANDALONE__
+# include <stdlib.h>
+# include <string.h>
+#endif /* __UD_STANDALONE__ */
+
 /* =============================================================================
  * ud_init() - Initializes ud_t object.
  * =============================================================================