From c24ed7019341148dab6d639b026aaf701e8fac0c Mon Sep 17 00:00:00 2001
From: "Marc G. Fournier" <scrappy@hub.org>
Date: Tue, 10 Mar 1998 05:24:33 +0000
Subject: [PATCH] Get the ultrix4 ports back in sync...
---
.../dynloader.c => dynloader/ultrix4.c} | 2 +-
.../{ultrix4/dl.h => dynloader/ultrix4.h} | 2 +-
src/backend/port/ultrix4/Makefile | 34 ---------------
src/backend/port/ultrix4/port-protos.h | 43 -------------------
4 files changed, 2 insertions(+), 79 deletions(-)
rename src/backend/port/{ultrix4/dynloader.c => dynloader/ultrix4.c} (93%)
rename src/backend/port/{ultrix4/dl.h => dynloader/ultrix4.h} (98%)
delete mode 100644 src/backend/port/ultrix4/Makefile
delete mode 100644 src/backend/port/ultrix4/port-protos.h
diff --git a/src/backend/port/ultrix4/dynloader.c b/src/backend/port/dynloader/ultrix4.c
similarity index 93%
rename from src/backend/port/ultrix4/dynloader.c
rename to src/backend/port/dynloader/ultrix4.c
index 55271c5e0e6..7d1d493c2bc 100644
--- a/src/backend/port/ultrix4/dynloader.c
+++ b/src/backend/port/dynloader/ultrix4.c
@@ -9,7 +9,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/port/ultrix4/Attic/dynloader.c,v 1.6 1998/02/26 04:34:39 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/port/dynloader/ultrix4.c,v 1.1 1998/03/10 05:23:40 scrappy Exp $
*
*-------------------------------------------------------------------------
*/
diff --git a/src/backend/port/ultrix4/dl.h b/src/backend/port/dynloader/ultrix4.h
similarity index 98%
rename from src/backend/port/ultrix4/dl.h
rename to src/backend/port/dynloader/ultrix4.h
index 9014e151a5c..47bb5e33392 100644
--- a/src/backend/port/ultrix4/dl.h
+++ b/src/backend/port/dynloader/ultrix4.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: dl.h,v 1.5 1997/09/08 02:27:33 momjian Exp $
+ * $Id: ultrix4.h,v 1.1 1998/03/10 05:23:46 scrappy Exp $
*
*-------------------------------------------------------------------------
*/
diff --git a/src/backend/port/ultrix4/Makefile b/src/backend/port/ultrix4/Makefile
deleted file mode 100644
index db84c05a3e7..00000000000
--- a/src/backend/port/ultrix4/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-#-------------------------------------------------------------------------
-#
-# Makefile--
-# Makefile for port/ultrix
-#
-# IDENTIFICATION
-# $Header: /cvsroot/pgsql/src/backend/port/ultrix4/Attic/Makefile,v 1.3 1997/12/20 00:26:38 scrappy Exp $
-#
-#-------------------------------------------------------------------------
-
-SRCDIR = ../../..
-include ../../../Makefile.global
-
-INCLUDE_OPT = -I../..
-
-CFLAGS+=$(INCLUDE_OPT)
-
-OBJS = dynloader.o port.o strdup.o
-
-all: SUBSYS.o
-
-SUBSYS.o: $(OBJS)
- $(LD) -r -o SUBSYS.o $(OBJS)
-
-depend dep:
- $(CC) -MM $(INCLUDE_OPT) *.c >depend
-
-clean:
- rm -f SUBSYS.o $(OBJS)
-
-ifeq (depend,$(wildcard depend))
-include depend
-endif
-
diff --git a/src/backend/port/ultrix4/port-protos.h b/src/backend/port/ultrix4/port-protos.h
deleted file mode 100644
index fc3b40c7629..00000000000
--- a/src/backend/port/ultrix4/port-protos.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*-------------------------------------------------------------------------
- *
- * port-protos.h--
- * prototypes for Ultrix-specific routines
- *
- *
- * Copyright (c) 1994, Regents of the University of California
- *
- * $Id: port-protos.h,v 1.8 1997/12/19 22:46:47 scrappy Exp $
- *
- *-------------------------------------------------------------------------
- */
-#ifndef PORT_PORTOS_H
-#define PORT_PORTOS_H
-
-/*
- * Externals in libc that need prototypes (or at least declarations)
- */
-
-extern char *ecvt(double, int, int *, int *);
-extern char *fcvt(double, int, int *, int *);
-
-/* dynloader.c */
-/*
- * New dynamic loader.
- *
- * This dynamic loader uses Andrew Yu's libdl-1.0 package for Ultrix 4.x.
- * (Note that pg_dlsym and pg_dlclose are actually macros defined in
- * "port-protos.h".)
- */
-
-#define pg_dlsym(h, f) ((func_ptr)dl_sym(h, f))
-#define pg_dlclose(h) dl_close(h)
-#define pg_dlerror() dl_error()
-extern int dl_init(char *);
-
-/* port.c */
-
-extern int syscall();
-
-extern void init_address_fixup(void);
-
-#endif /* PORT_PORTOS_H */
--
GitLab