patch-unix_unix_cpp 999 B

1234567891011121314151617181920212223242526272829303132333435
  1. $OpenBSD: patch-unix_unix_cpp,v 1.1 2011/07/07 14:45:22 jasper Exp $
  2. Redo pre-processor block to prevent:
  3. unix.cpp:2543:8: error: macro names must be identifiers
  4. --- unix/unix.cpp.orig Tue Aug 3 01:14:17 2004
  5. +++ unix/unix.cpp Thu Jul 7 15:38:35 2011
  6. @@ -2339,12 +2339,13 @@ static bool unix_svga_mode (void)
  7. static int unix_get_command_line (int *argc, char **argv[])
  8. {
  9. is_using_xwin = unix_xwin_mode(*argc, *argv);
  10. - if(is_using_xwin)
  11. -#ifndef X_DISPLAY_MISSING
  12. - XWIN_init_povray(argc, argv); // this changes the command-line args
  13. + if(is_using_xwin) {
  14. +#if X_DISPLAY_MISSING
  15. + ; // do nothing
  16. #else
  17. - ; // do nothing
  18. + XWIN_init_povray(argc, argv); // this changes the command-line args
  19. #endif
  20. + }
  21. else
  22. {
  23. is_using_svga = unix_svga_mode();
  24. @@ -2542,7 +2543,7 @@ int POV_Std_Test_Abort(void)
  25. *
  26. ******************************************************************************/
  27. -#ifdef UNDERFLOW
  28. +#if 0
  29. #ifdef exception
  30. int matherr(struct exception *x)