From 53231b162b593a9d5eb54ea15b3f5eb81588184a Mon Sep 17 00:00:00 2001
From: David Rose <david@ddrose.com>
Date: Wed, 17 Jun 2009 04:22:23 +0000
Subject: [PATCH] minor tweaks

---
 direct/src/plugin/p3dSession.cxx |  7 ++++++-
 direct/src/plugin/p3d_plugin.h   | 19 +++----------------
 2 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/direct/src/plugin/p3dSession.cxx b/direct/src/plugin/p3dSession.cxx
index 8723f11c5c..374247aef0 100644
--- a/direct/src/plugin/p3dSession.cxx
+++ b/direct/src/plugin/p3dSession.cxx
@@ -86,7 +86,12 @@ P3DSession::
     }
 
     CloseHandle(_p3dpython_handle);
-#endif
+
+#else  // _WIN32
+
+    // TODO: posix kill().
+
+#endif  // _WIN32
   }
 
   // If there are any leftover commands in the queue (presumably
diff --git a/direct/src/plugin/p3d_plugin.h b/direct/src/plugin/p3d_plugin.h
index 4eb3089b6b..ca00f29d00 100644
--- a/direct/src/plugin/p3d_plugin.h
+++ b/direct/src/plugin/p3d_plugin.h
@@ -281,7 +281,7 @@ P3D_instance_set_property_func(P3D_instance *instance,
    P3D_instance_get_request.  More types may be added later. */
 typedef enum {
   P3D_RT_stop,
-  P3D_RT_new_config_xml,
+  P3D_RT_unused, //  P3D_RT_new_config_xml,
   P3D_RT_get_url,
   P3D_RT_post_url,
 } P3D_request_type;
@@ -294,18 +294,6 @@ typedef enum {
 typedef struct {
 } P3D_request_stop;
 
-/* A new config_xml request.  The plugin has determined that its
-   operating environment has changed, and that a new config.xml file
-   should be stored for future sessions.  The plugin passes a new
-   config_xml data stream to the host, which should save it
-   permanently within its own cache.  The original config_xml should
-   be replaced with this new stream; for all future sessions, when the
-   host loads and starts the plugin DLL, it should pass this new
-   config_xml stream to the P3D_initialize() function. */
-typedef struct {
-  const char *_config_xml;
-} P3D_request_new_config_xml;
-
 /* A get_url request.  The plugin would like to retrieve data for a
    particular URL.  The plugin is responsible for supplying a valid
    URL string, and a unique integer ID.  The unique ID is needed to
@@ -338,7 +326,6 @@ typedef struct {
   P3D_request_type _request_type;
   union {
     P3D_request_stop _stop;
-    P3D_request_new_config_xml _new_config_xml;
     P3D_request_get_url _get_url;
     P3D_request_post_url _post_url;
   } _request;
@@ -356,14 +343,14 @@ typedef struct {
 typedef P3D_request *
 P3D_instance_get_request_func(P3D_instance *instance);
 
-/* This method may also be used to test whether a request to be ready.
+/* This method may also be used to test whether a request is ready.
    If any open instance has a pending request, this function will
    return a pointer to one of them (which you may then pass to
    P3D_instance_get_request_func).  If no instances have a pending
    request, this function will return NULL.  If wait is true, this
    function will never return NULL unless there are no instances open;
    instead, it will wait indefinitely until there is a request
-   available. 
+   available.
 
    Note that, due to race conditions, it is possible for this function
    to return a P3D_instance that does not in fact have any requests