David Rose преди 17 години
родител
ревизия
f87b67df13
променени са 2 файла, в които са добавени 6 реда и са изтрити 1 реда
  1. 1 1
      panda/src/tinydisplay/tinyOsxGraphicsPipe.h
  2. 5 0
      panda/src/tinydisplay/tinydisplay_composite2.cxx

+ 1 - 1
panda/src/tinydisplay/tinyOsxGraphicsPipe.h

@@ -21,7 +21,7 @@
 
 
 // We have to include this early, before anyone includes
 // We have to include this early, before anyone includes
 // netinet/tcp.h, which will define TCP_NODELAY and other symbols and
 // netinet/tcp.h, which will define TCP_NODELAY and other symbols and
-// confuse the Apply system headers.
+// confuse the Apple system headers.
 #include <Carbon/Carbon.h>
 #include <Carbon/Carbon.h>
 
 
 #include "graphicsPipe.h"
 #include "graphicsPipe.h"

+ 5 - 0
panda/src/tinydisplay/tinydisplay_composite2.cxx

@@ -1,3 +1,8 @@
+// We have to include this early, before anyone includes
+// netinet/tcp.h, which will define TCP_NODELAY and other symbols and
+// confuse the Apple system headers.
+#include "tinyOsxGraphicsPipe.h"
+
 #include "tinyGraphicsStateGuardian.cxx"
 #include "tinyGraphicsStateGuardian.cxx"
 #include "tinyOsxGraphicsPipe.cxx"
 #include "tinyOsxGraphicsPipe.cxx"
 #include "tinySDLGraphicsPipe.cxx"
 #include "tinySDLGraphicsPipe.cxx"