- Move rosdhcp_public.h to dhcp library include directory.

Added: trunk/reactos/include/libs/dhcp/
Added: trunk/reactos/include/libs/dhcp/rosdhcp_public.h

Deleted: trunk/reactos/include/rosdhcp_public.h

Modified: trunk/reactos/lib/dhcpcapi/dhcpcapi.c
Modified: trunk/reactos/subsys/system/dhcp/include/rosdhcp.h

--- trunk/reactos/include/rosdhcp_public.h	2005-07-20 03:43:20 UTC (rev 16658)
+++ trunk/reactos/include/rosdhcp_public.h	2005-07-20 03:50:50 UTC (rev 16659)
@@ -1,46 +0,0 @@

-#ifndef ROSDHCP_PUBLIC_H
-#define ROSDHCP_PUBLIC_H
-
-enum {
-    DhcpReqLeaseIpAddress,
-    DhcpReqQueryHWInfo,
-    DhcpReqReleaseIpAddress,
-    DhcpReqRenewIpAddress,
-    DhcpReqStaticRefreshParams,
-};
-
-typedef struct _COMM_DHCP_REQ {
-    UINT Type;
-    DWORD AdapterIndex;
-    union {
-        struct {
-            BOOL Inserted;
-        } PnpEvent;
-        struct {
-            LPWSTR AdapterName;
-            DHCPCAPI_PARAMS_ARRAY Params;
-        } RegisterParamChange;
-        struct {
-            LPWSTR AdapterName;
-            LPWSTR RequestId;
-        } RequestParams, UndoRequestParams;
-        struct {
-            DWORD IPAddress;
-            DWORD Netmask;
-        } StaticRefreshParams;
-    } Body;
-} COMM_DHCP_REQ;
-
-typedef union _COMM_DHCP_REPLY {
-    DWORD Reply;
-    struct {
-        DWORD AdapterIndex;
-        DWORD MediaType;
-        DWORD Mtu;
-        DWORD Speed;
-    } QueryHWInfo;
-} COMM_DHCP_REPLY;
-
-#define DHCP_PIPE_NAME "\\\\.\\pipe\\dhcpclient"
-
-#endif/*ROSDHCP_PUBLIC_H*/

--- trunk/reactos/lib/dhcpcapi/dhcpcapi.c	2005-07-20 03:43:20 UTC (rev 16658)
+++ trunk/reactos/lib/dhcpcapi/dhcpcapi.c	2005-07-20 03:50:50 UTC (rev 16659)
@@ -12,7 +12,7 @@

 #include <roscfg.h>
 #include <winsock2.h>
 #include <dhcpcsdk.h>

-#include <rosdhcp_public.h>

+#include <dhcp/rosdhcp_public.h>

 
 #define DHCP_TIMEOUT 1000
 

--- trunk/reactos/subsys/system/dhcp/include/rosdhcp.h	2005-07-20 03:43:20 UTC (rev 16658)
+++ trunk/reactos/subsys/system/dhcp/include/rosdhcp.h	2005-07-20 03:50:50 UTC (rev 16659)
@@ -12,6 +12,7 @@

 #include <setjmp.h>
 #include "stdint.h"
 #include "predec.h"

+#include <dhcp/rosdhcp_public.h>

 #include "debug.h"
 #define IFNAMSIZ MAX_INTERFACE_NAME_LEN
 #undef interface /* wine/objbase.h -- Grrr */
@@ -50,8 +51,6 @@

     unsigned char recv_buf[1];
 } DHCP_ADAPTER, *PDHCP_ADAPTER;
 

-#include <rosdhcp_public.h>
-

 typedef DWORD (*PipeSendFunc)( COMM_DHCP_REPLY *Reply );
 
 #define random rand