Merge defines.h into int.h.

diff --git a/doc/reference/Makefile.am b/doc/reference/Makefile.am
index 3e91e84..69f26b2 100644 (file)
--- a/doc/reference/Makefile.am
+++ b/doc/reference/Makefile.am
@@ -43,7 +43,7 @@ CFILE_GLOB=$(top_srcdir)/lib/*.c
 
 # Header files to ignore when scanning.
 # e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h
-IGNORE_HFILES=defines.h errors.h int.h parser_aux.h structure.h        \
+IGNORE_HFILES=errors.h int.h parser_aux.h structure.h  \
        element.h gstr.h mem.h config.h
 
 # Images to copy into HTML directory.

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 00f3a3c..a6dce8f 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in
-# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation
+# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation
 #
 # This file is part of LIBTASN1.
 #
@@ -29,7 +29,7 @@ pkgconfig_DATA = libtasn1.pc
 lib_LTLIBRARIES = libtasn1.la
 
 libtasn1_la_SOURCES = libtasn1.h mem.h gstr.h errors.h \
-       defines.h int.h parser_aux.h structure.h element.h ASN1.y       \
+       int.h parser_aux.h structure.h element.h ASN1.y \
        decoding.c gstr.c errors.c parser_aux.c structure.c element.c   \
        coding.c libtasn1.vers
 

diff --git a/lib/defines.h b/lib/defines.h
deleted file mode 100644 (file)
index a459bc0..0000000
--- a/lib/defines.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- *      Copyright (C) 2006, 2008 Free Software Foundation, Inc.
- *      Copyright (C) 2000,2001,2002,2005 Nikos Mavroyanopoulos
- *
- * This file is part of LIBTASN1.
- *
- * The LIBTASN1 library is free software; you can redistribute it
- * and/or modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA
- */
-
-#ifndef DEFINES_H
-# define DEFINES_H
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <ctype.h>
-#include <stdint.h>
-
-#ifdef HAVE_STRINGS_H
-# include <strings.h>
-#endif
-
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-
-#endif /* defines_h */

diff --git a/lib/int.h b/lib/int.h
index 0851689..cabe697 100644 (file)
--- a/lib/int.h
+++ b/lib/int.h
@@ -1,5 +1,5 @@
 /*
- *      Copyright (C) 2004, 2006 Free Software Foundation, Inc.
+ *      Copyright (C) 2004, 2006, 2008 Free Software Foundation, Inc.
  *      Copyright (C) 2002 Fabio Fiorina
  *
  * This file is part of LIBTASN1.
@@ -23,9 +23,25 @@
 #ifndef INT_H
 #define INT_H
 
-#include <libtasn1.h>
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <ctype.h>
+#include <stdint.h>
+
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif
 
-#include <defines.h>
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+
+#include <libtasn1.h>
 
 /*
 #define LIBTASN1_DEBUG