*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
#if !defined (DBUS_INSIDE_DBUS_H) && !defined (DBUS_COMPILATION)
#ifndef DBUS_ARCH_DEPS_H
#define DBUS_ARCH_DEPS_H
-#include <dbus/dbus-types.h>
#include <dbus/dbus-macros.h>
-DBUS_BEGIN_DECLS;
+DBUS_BEGIN_DECLS
#if @DBUS_HAVE_INT64@
#define DBUS_HAVE_INT64 1
-typedef @DBUS_INT64_TYPE@ dbus_int64_t;
-typedef unsigned @DBUS_INT64_TYPE@ dbus_uint64_t;
+_DBUS_GNUC_EXTENSION typedef @DBUS_INT64_TYPE@ dbus_int64_t;
+_DBUS_GNUC_EXTENSION typedef unsigned @DBUS_INT64_TYPE@ dbus_uint64_t;
-#define DBUS_INT64_CONSTANT(val) @DBUS_INT64_CONSTANT@
-#define DBUS_UINT64_CONSTANT(val) @DBUS_UINT64_CONSTANT@
+#define DBUS_INT64_CONSTANT(val) (_DBUS_GNUC_EXTENSION @DBUS_INT64_CONSTANT@)
+#define DBUS_UINT64_CONSTANT(val) (_DBUS_GNUC_EXTENSION @DBUS_UINT64_CONSTANT@)
#else
#undef DBUS_HAVE_INT64
#undef DBUS_UINT64_CONSTANT
#endif
-DBUS_END_DECLS;
+typedef @DBUS_INT32_TYPE@ dbus_int32_t;
+typedef unsigned @DBUS_INT32_TYPE@ dbus_uint32_t;
+
+typedef @DBUS_INT16_TYPE@ dbus_int16_t;
+typedef unsigned @DBUS_INT16_TYPE@ dbus_uint16_t;
+
+/* This is not really arch-dependent, but it's not worth
+ * creating an additional generated header just for this
+ */
+#define DBUS_MAJOR_VERSION @DBUS_MAJOR_VERSION@
+#define DBUS_MINOR_VERSION @DBUS_MINOR_VERSION@
+#define DBUS_MICRO_VERSION @DBUS_MICRO_VERSION@
+
+#define DBUS_VERSION_STRING "@DBUS_VERSION@"
+
+#define DBUS_VERSION ((@DBUS_MAJOR_VERSION@ << 16) | (@DBUS_MINOR_VERSION@ << 8) | (@DBUS_MICRO_VERSION@))
+
+DBUS_END_DECLS
#endif /* DBUS_ARCH_DEPS_H */