From 966121ccd8726b991cb409f7b7cc866509800f09 Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Wed, 26 Dec 2001 20:47:33 +0000
Subject: [PATCH] Removed the SEGPTR_* macros.

---
 dlls/oleaut32/ole2disp.h |  1 +
 include/heap.h           | 25 -------------------------
 2 files changed, 1 insertion(+), 25 deletions(-)

diff --git a/dlls/oleaut32/ole2disp.h b/dlls/oleaut32/ole2disp.h
index 97f683f7363..7b13b23cc29 100644
--- a/dlls/oleaut32/ole2disp.h
+++ b/dlls/oleaut32/ole2disp.h
@@ -2,6 +2,7 @@
 #define __WINE_OLEAUT32_OLE2DISP_H
 
 #include "wtypes.h"
+#include "wine/windef16.h"
 
 BSTR16 WINAPI SysAllocString16(LPCOLESTR16);
 BSTR16 WINAPI SysAllocStringLen16(const char*, int);
diff --git a/include/heap.h b/include/heap.h
index 48305544449..da35319429b 100644
--- a/include/heap.h
+++ b/include/heap.h
@@ -12,31 +12,6 @@
 #include "winbase.h"
 #include "winnls.h"
 #include "wine/unicode.h"
-#include "wine/windef16.h"  /* for SEGPTR */
-
-/* SEGPTR helper macros */
-
-#define SEGPTR_ALLOC(size) \
-     (HeapAlloc( GetProcessHeap(), 0, (size) ))
-#define SEGPTR_NEW(type) \
-     ((type *)HeapAlloc( GetProcessHeap(), 0, sizeof(type) ))
-#define SEGPTR_STRDUP_WtoA(str) \
-     (HIWORD(str) ? HEAP_strdupWtoA( GetProcessHeap(), 0, (str) ) : (LPSTR)(str))
-#define SEGPTR_FREE(ptr) \
-     (HIWORD(ptr) ? HeapFree( GetProcessHeap(), 0, (ptr) ) : 0)
-#define SEGPTR_GET(ptr) MapLS(ptr)
-
-inline static LPSTR SEGPTR_STRDUP( LPCSTR str )
-{
-    if (HIWORD(str))
-    {
-        INT len = strlen(str) + 1;
-        LPSTR p = HeapAlloc( GetProcessHeap(), 0, len );
-        if (p) memcpy( p, str, len );
-        return p;
-    }
-    return (LPSTR)str;
-}
 
 /* strdup macros */
 /* DO NOT USE THEM!!  they will go away soon */