TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-17 12:12:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

resolve mis-matching of winsock versions

Browse Source
This commit is contained in:
Chris Brunner 2010-07-06 21:56:29 +00:00
parent da430735ad
commit ab1016269c
3 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
direct/src/plugin_standalone/p3dEmbed.h
View File

@ -15,6 +15,10 @@
#ifndef P3DEMBED_H
#define P3DEMBED_H
#ifdef _WIN32
#include <winsock2.h>
#endif
#include "panda3dBase.h"
#include "p3d_plugin.h"
#include "httpChannel.h"

5
direct/src/plugin_standalone/panda3d.h
View File

@ -15,6 +15,11 @@
#ifndef PANDA3D_H
#define PANDA3D_H
#ifdef _WIN32
#include <winsock2.h>
#endif
#include "panda3dBase.h"
#include "p3d_plugin.h"
#include "httpChannel.h"

13
direct/src/plugin_standalone/panda3dBase.cxx
View File

@ -12,6 +12,12 @@
//
////////////////////////////////////////////////////////////////////
#ifdef _WIN32
#include <winsock2.h>
#include <windows.h>
#else
#include <signal.h>
#endif
#include "panda3dBase.h"
#include "httpClient.h"
#include "find_root_dir.h"
@ -26,11 +32,6 @@
#include <ctype.h>
#include <sstream>
#include <algorithm>
#ifdef _WIN32
#include <windows.h>
#else
#include <signal.h>
#endif
// The amount of time in seconds to wait for new messages.
static const double wait_cycle = 0.2;
@ -269,7 +270,7 @@ make_parent_window() {
HINSTANCE application = GetModuleHandle(NULL);
ZeroMemory(&wc, sizeof(WNDCLASS));
wc.lpfnWndProc = window_proc;
wc.lpfnWndProc = (WNDPROC)window_proc;
wc.hInstance = application;
wc.hbrBackground = (HBRUSH)GetStockObject(WHITE_BRUSH);
wc.lpszClassName = "panda3d";