Guest User

Untitled

a guest
Mar 26th, 2010
238
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 1.37 KB | None | 0 0
  1. Index: cpptoxml/parser/rpp-allocator.h
  2. ===================================================================
  3. --- cpptoxml/parser/rpp-allocator.h (revision 1107766)
  4. +++ cpptoxml/parser/rpp-allocator.h (working copy)
  5. @@ -21,4 +21,9 @@
  6. **
  7. ****************************************************************************/
  8.  
  9. +#ifndef CPPTOXML_RPPALLOCATOR_H
  10. +#define CPPTOXML_RPPALLOCATOR_H
  11. +
  12. #include "rxx_allocator.h"
  13. +
  14. +#endif
  15. Index: cpptoxml/parser/include/stdarg.h
  16. ===================================================================
  17. --- cpptoxml/parser/include/stdarg.h (revision 1107766)
  18. +++ cpptoxml/parser/include/stdarg.h (working copy)
  19. @@ -12,8 +12,8 @@
  20. ****************************************************************************/
  21.  
  22.  
  23. -#ifndef __STDARG
  24. -#define __STDARG
  25. +#ifndef CPPTOXML_STDARG
  26. +#define CPPTOXML_STDARG
  27.  
  28. #if !defined(_VA_LIST) && !defined(__VA_LIST_DEFINED)
  29. #define _VA_LIST
  30. Index: cpptoxml/parser/tokens.cpp
  31. ===================================================================
  32. --- cpptoxml/parser/tokens.cpp (revision 1107766)
  33. +++ cpptoxml/parser/tokens.cpp (working copy)
  34. @@ -23,10 +23,10 @@
  35. ****************************************************************************/
  36.  
  37.  
  38. +#include "tokens.h"
  39. +
  40. #include <QtCore/qglobal.h>
  41.  
  42. -#include "tokens.h"
  43. -
  44. static char const * const _S_token_names[] = {
  45. "K_DCOP",
  46. "Q_OBJECT",
Advertisement
Add Comment
Please, Sign In to add comment