From 9e90d118100147c474060972026558b806eabbe3 Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Wed, 30 Oct 2002 01:15:51 +0000
Subject: [PATCH] Remove /src/utils. Is final cleanup of getopt.c resurection.
---
src/test/regress/expected/join.out | 4 +-
src/test/regress/sql/join.sql | 4 +-
src/utils/Makefile | 18 -----
src/utils/dllinit.c | 108 -----------------------------
4 files changed, 4 insertions(+), 130 deletions(-)
delete mode 100644 src/utils/Makefile
delete mode 100644 src/utils/dllinit.c
diff --git a/src/test/regress/expected/join.out b/src/test/regress/expected/join.out
index fdb6ceac999..ec40303f61c 100644
--- a/src/test/regress/expected/join.out
+++ b/src/test/regress/expected/join.out
@@ -1788,7 +1788,7 @@ SELECT '' AS "xxx", *
SELECT '' AS "xxx", *
FROM J1_TBL FULL OUTER JOIN J2_TBL USING (i)
- ORDER BY i;
+ ORDER BY i, t;
xxx | i | j | t | k
-----+---+---+-------+----
| 0 | | zero |
@@ -1810,7 +1810,7 @@ SELECT '' AS "xxx", *
SELECT '' AS "xxx", *
FROM J1_TBL FULL JOIN J2_TBL USING (i)
- ORDER BY i;
+ ORDER BY i, t;
xxx | i | j | t | k
-----+---+---+-------+----
| 0 | | zero |
diff --git a/src/test/regress/sql/join.sql b/src/test/regress/sql/join.sql
index a4df5c04ae4..98c94ac34e6 100644
--- a/src/test/regress/sql/join.sql
+++ b/src/test/regress/sql/join.sql
@@ -181,11 +181,11 @@ SELECT '' AS "xxx", *
SELECT '' AS "xxx", *
FROM J1_TBL FULL OUTER JOIN J2_TBL USING (i)
- ORDER BY i;
+ ORDER BY i, t;
SELECT '' AS "xxx", *
FROM J1_TBL FULL JOIN J2_TBL USING (i)
- ORDER BY i;
+ ORDER BY i, t;
SELECT '' AS "xxx", *
FROM J1_TBL LEFT JOIN J2_TBL USING (i) WHERE (k = 1);
diff --git a/src/utils/Makefile b/src/utils/Makefile
deleted file mode 100644
index c470e879a6e..00000000000
--- a/src/utils/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-#-------------------------------------------------------------------------
-#
-# Makefile for utils
-#
-# $Header: /cvsroot/pgsql/src/utils/Attic/Makefile,v 1.16 2002/10/19 02:23:26 momjian Exp $
-#
-# dllinit.o is only built on Win32 platform.
-#
-#-------------------------------------------------------------------------
-
-subdir = src/utils
-top_builddir = ../..
-include $(top_builddir)/src/Makefile.global
-
-all:
-
-clean distclean maintainer-clean:
- rm -f dllinit.o
diff --git a/src/utils/dllinit.c b/src/utils/dllinit.c
deleted file mode 100644
index e30a76a5f25..00000000000
--- a/src/utils/dllinit.c
+++ /dev/null
@@ -1,108 +0,0 @@
-#include <cygwin/version.h>
-#if CYGWIN_VERSION_DLL_MAJOR < 1001
-
-/* dllinit.c -- Portable DLL initialization.
- Copyright (C) 1998 Free Software Foundation, Inc.
- Contributed by Mumit Khan (khan@xraylith.wisc.edu).
-
- I've used DllMain as the DLL "main" since that's the most common
- usage. MSVC and Mingw32 both default to DllMain as the standard
- callback from the linker entry point. Cygwin32 b19+ uses essentially
- the same, albeit slightly differently implemented, scheme. Please
- see DECLARE_CYGWIN_DLL macro in <cygwin32/cygwin_dll.h> for more
- info on how Cygwin32 uses the callback function.
-
- The real entry point is typically always defined by the runtime
- library, and usually never overridden by (casual) user. What you can
- override however is the callback routine that the entry point calls,
- and this file provides such a callback function, DllMain.
-
- Mingw32: The default entry point for mingw32 is DllMainCRTStartup
- which is defined in libmingw32.a This in turn calls DllMain which is
- defined here. If not defined, there is a stub in libmingw32.a which
- does nothing.
-
- Cygwin32: The default entry point for cygwin32 b19 or newer is
- __cygwin32_dll_entry which is defined in libcygwin.a. This in turn
- calls the routine you supply to the DECLARE_CYGWIN_DLL (see below)
- and, for this example, I've chose DllMain to be consistent with all
- the other platforms.
-
- MSVC: MSVC runtime calls DllMain, just like Mingw32.
-
- Summary: If you need to do anything special in DllMain, just add it
- here. Otherwise, the default setup should be just fine for 99%+ of
- the time. I strongly suggest that you *not* change the entry point,
- but rather change DllMain as appropriate.
-
- */
-
-
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#undef WIN32_LEAN_AND_MEAN
-#include <stdio.h>
-
-BOOL APIENTRY DllMain(HINSTANCE hInst, DWORD reason,
- LPVOID reserved /* Not used. */ );
-
-#ifdef __CYGWIN__
-
-#include <cygwin/cygwin_dll.h>
-DECLARE_CYGWIN_DLL(DllMain);
-/* save hInstance from DllMain */
-HINSTANCE __hDllInstance_base;
-#endif /* __CYGWIN__ */
-
-struct _reent *_impure_ptr;
-
-extern struct _reent *__imp_reent_data;
-
-/*
- *----------------------------------------------------------------------
- *
- * DllMain
- *
- * This routine is called by the Mingw32, Cygwin32 or VC++ C run
- * time library init code, or the Borland DllEntryPoint routine. It
- * is responsible for initializing various dynamically loaded
- * libraries.
- *
- * Results:
- * TRUE on sucess, FALSE on failure.
- *
- * Side effects:
- *
- *----------------------------------------------------------------------
- */
-BOOL APIENTRY
-DllMain(
- HINSTANCE hInst /* Library instance handle. */ ,
- DWORD reason /* Reason this function is being called. */ ,
- LPVOID reserved /* Not used. */ )
-{
-
-#ifdef __CYGWIN__
- __hDllInstance_base = hInst;
-#endif /* __CYGWIN__ */
-
- _impure_ptr = __imp_reent_data;
-
- switch (reason)
- {
- case DLL_PROCESS_ATTACH:
- break;
-
- case DLL_PROCESS_DETACH:
- break;
-
- case DLL_THREAD_ATTACH:
- break;
-
- case DLL_THREAD_DETACH:
- break;
- }
- return TRUE;
-}
-
-#endif /* CYGWIN_VERSION_DLL_MAJOR < 1001 */
--
GitLab