mirror of the now-defunct rocklinux.org
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

49 lines
1.8 KiB

  1. The usual gcc-3.4 fixes + some unusal ones ...
  2. - Rene Rebe <rene@rocklinux.org>
  3. diff -ur kismet-3.0.1/kismet_drone.cc kismet-3.0.1-fixed/kismet_drone.cc
  4. --- kismet-3.0.1/kismet_drone.cc 2003-07-22 01:34:23.000000000 +0200
  5. +++ kismet-3.0.1-fixed/kismet_drone.cc 2004-05-10 13:16:48.194992328 +0200
  6. @@ -72,7 +72,7 @@
  7. pak.flags = CAPFLAG_NONE;
  8. pak.datalen = 1;
  9. pak.data = (uint8_t *) malloc(1);
  10. - (int8_t) pak.data[0] = CAPCMD_DIE;
  11. + pak.data[0] = (uint8_t)CAPCMD_DIE;
  12. for (unsigned int x = 0; x < packet_sources.size(); x++) {
  13. if (packet_sources[x]->alive) {
  14. diff -ur kismet-3.0.1/kismet_server.cc kismet-3.0.1-fixed/kismet_server.cc
  15. --- kismet-3.0.1/kismet_server.cc 2003-07-31 16:26:59.000000000 +0200
  16. +++ kismet-3.0.1-fixed/kismet_server.cc 2004-05-10 13:17:22.243816120 +0200
  17. @@ -259,7 +259,7 @@
  18. pak.flags = CAPFLAG_NONE;
  19. pak.datalen = 1;
  20. pak.data = (uint8_t *) malloc(1);
  21. - (int8_t) pak.data[0] = CAPCMD_DIE;
  22. + pak.data[0] = (uint8_t) CAPCMD_DIE;
  23. for (unsigned int x = 0; x < packet_sources.size(); x++) {
  24. if (packet_sources[x]->alive) {
  25. diff -ur kismet-3.0.1/packet.h kismet-3.0.1-fixed/packet.h
  26. --- kismet-3.0.1/packet.h 2003-07-31 16:26:59.000000000 +0200
  27. +++ kismet-3.0.1-fixed/packet.h 2004-05-10 13:08:31.587776568 +0200
  28. @@ -548,7 +548,7 @@
  29. // This isn't quite like STL iterators, because I'm too damned lazy to deal with all
  30. // the nasty STL hoop-jumping. This does provide a somewhat-stl-ish interface to
  31. // iterating through the singleton and masked maps
  32. - friend class iterator {
  33. + class iterator {
  34. friend class macmap;
  35. public:
  36. @@ -641,6 +641,7 @@
  37. int vector_itr;
  38. macmap<T> *owner;
  39. };
  40. + friend class iterator;
  41. iterator begin() {
  42. iterator ret(this);