Merge branch 'next'

Conflicts:
	host/lib/usrp/usrp2/codec_impl.cpp

1 files changed, 0 insertions, 34 deletions

diff --git a/firmware/microblaze/lib/stdint.h b/firmware/microblaze/lib/stdint.h
deleted file mode 100644
index b5a8611a9..000000000
--- a/firmware/microblaze/lib/stdint.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* -*- c -*- */
-/*
- * Copyright 2007,2009 Free Software Foundation, Inc.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef INCLUDED_STDINT_H
-#define INCLUDED_STDINT_H
-
-typedef signed char	int8_t;
-typedef unsigned char	uint8_t;
-typedef short		int16_t;
-typedef unsigned short	uint16_t;
-typedef int		int32_t;
-typedef unsigned int	uint32_t;
-typedef long long int		int64_t;
-typedef unsigned long long int	uint64_t;
-
-typedef int		intptr_t;
-typedef unsigned int	uintptr_t;
-
-#endif /* INCLUDED_STDINT_H */