diff options
| author | jcorgan | 2008-08-24 17:41:07 +0000 |
|---|---|---|
| committer | jcorgan | 2008-08-24 17:41:07 +0000 |
| commit | 34af4364456b9005efee3c3986ea0f4dce87c99e (patch) | |
| tree | 06dc2b36e42a00985364f043748f9ab1881bde0b /usrp/host/lib | |
| parent | 66a225bf721cd61c736879bdf8ab44674319426d (diff) | |
| download | gnuradio-34af4364456b9005efee3c3986ea0f4dce87c99e.tar.gz gnuradio-34af4364456b9005efee3c3986ea0f4dce87c99e.tar.bz2 gnuradio-34af4364456b9005efee3c3986ea0f4dce87c99e.zip | |
Fix compiler warnings across the tree. Adds --enable-warnings-as-errors configure option. Currently compiles with no warnings with GCC 4.2.3 on Ubuntu 8.04.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@9396 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'usrp/host/lib')
| -rw-r--r-- | usrp/host/lib/legacy/std_paths.h.in | 2 | ||||
| -rw-r--r-- | usrp/host/lib/legacy/usrp_prims.cc | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/usrp/host/lib/legacy/std_paths.h.in b/usrp/host/lib/legacy/std_paths.h.in index 9c26cfa23..e09499e0b 100644 --- a/usrp/host/lib/legacy/std_paths.h.in +++ b/usrp/host/lib/legacy/std_paths.h.in @@ -20,7 +20,7 @@ * Boston, MA 02110-1301, USA. */ -static char *std_paths[] = { +static const char *std_paths[] = { "@prefix@/share/usrp", "/usr/local/share/usrp", 0 diff --git a/usrp/host/lib/legacy/usrp_prims.cc b/usrp/host/lib/legacy/usrp_prims.cc index 0034bb31e..c2f74f5f1 100644 --- a/usrp/host/lib/legacy/usrp_prims.cc +++ b/usrp/host/lib/legacy/usrp_prims.cc @@ -58,8 +58,8 @@ static const int hash_slot_addr[2] = { USRP_HASH_SLOT_1_ADDR }; -static char *default_firmware_filename = "std.ihx"; -static char *default_fpga_filename = "std_2rxhb_2tx.rbf"; +static const char *default_firmware_filename = "std.ihx"; +static const char *default_fpga_filename = "std_2rxhb_2tx.rbf"; #include "std_paths.h" #include <stdio.h> @@ -67,7 +67,7 @@ static char *default_fpga_filename = "std_2rxhb_2tx.rbf"; static char * find_file (const char *filename, int hw_rev) { - char **sp = std_paths; + const char **sp = std_paths; static char path[1000]; char *s; |