gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-06-01 17:12:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

cleanup compatibility header installation

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@29793 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
rfm 2010-02-28 09:10:16 +00:00
parent 3375a91946
commit c01d7213e5
8 changed files with 8 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Headers/Additions/GNUstepBase/GSObjCRuntime.h
View file

@ -43,7 +43,7 @@
#else #else
/* We emulate an ObjC2 runtime. /* We emulate an ObjC2 runtime.
*/ */
#include <GNUstepBase/runtime.h> #include <ObjectiveC2/runtime.h>
#endif #endif
#ifdef __cplusplus #ifdef __cplusplus

7
Source/GNUmakefile
View file

@ -142,12 +142,6 @@ behavior.h \
preface.h \ preface.h \
Additions.h Additions.h
# If we are using ObjC2 compatibility, we need to include the runtime.h
# header with all the additional headers.
ifeq ($(OBJC2RUNTIME),0)
ADD_HEADERS += runtime.h
endif
GNU_HEADERS = $(ADD_HEADERS) GNU_HEADERS = $(ADD_HEADERS)
# GNUStep source files # GNUStep source files
@ -444,7 +438,6 @@ HEADERS_INSTALL = $(GNU_HEADERS) \
GENERATED_HFILES = \ GENERATED_HFILES = \
dynamic-load.h \ dynamic-load.h \
$(HEADER_DIR_BASE)/preface.h \ $(HEADER_DIR_BASE)/preface.h \
$(HEADER_DIR_BASE)/runtime.h \
$(GNUSTEP_TARGET_DIR)/config.h \ $(GNUSTEP_TARGET_DIR)/config.h \
$(GNUSTEP_TARGET_DIR)/GNUstepBase/GSConfig.h $(GNUSTEP_TARGET_DIR)/GNUstepBase/GSConfig.h

4
Source/Makefile.postamble
View file

@ -95,7 +95,6 @@ before-uninstall::
# Things to do after cleaning # Things to do after cleaning
after-clean:: after-clean::
rm -f libgnustep-base.def rm -f libgnustep-base.def
rm -f ../Headers/Additions/GNUstep/runtime.h
rm -f ../Headers/Foundation/Foundation.h.saved rm -f ../Headers/Foundation/Foundation.h.saved
# Things to do before distcleaning # Things to do before distcleaning
@ -142,9 +141,6 @@ $(GNUSTEP_TARGET_DIR)/mframe.h: mframe/config.status
-mv mframe/mframe.h $(GNUSTEP_TARGET_DIR) -mv mframe/mframe.h $(GNUSTEP_TARGET_DIR)
-touch $(GNUSTEP_TARGET_DIR)/mframe.h -touch $(GNUSTEP_TARGET_DIR)/mframe.h
$(HEADER_DIR_BASE)/runtime.h: ObjectiveC2/runtime.h
cp ObjectiveC2/runtime.h $(HEADER_DIR_BASE)
# #
# Files where optimisation breaks the code! # Files where optimisation breaks the code!
# These have to filter the optimisation flag out. # These have to filter the optimisation flag out.

2
Source/ObjectiveC2/blocks_runtime.h
View file

@ -2,7 +2,7 @@
* Blocks Runtime * Blocks Runtime
*/ */
#include "Availability.h" #include "ObjectiveC2/Availability.h"
#ifdef __cplusplus #ifdef __cplusplus
#define BLOCKS_EXPORT extern "C" #define BLOCKS_EXPORT extern "C"
#else #else

4
Source/ObjectiveC2/blocks_runtime.m
View file

@ -23,8 +23,8 @@
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
* OTHER DEALINGS IN THE SOFTWARE. * OTHER DEALINGS IN THE SOFTWARE.
*/ */
#import "blocks_runtime.h" #import "ObjectiveC2/blocks_runtime.h"
#import "runtime.h" #import "ObjectiveC2/runtime.h"
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>

4
Source/ObjectiveC2/runtime.c
View file

@ -1,4 +1,4 @@
#include "runtime.h" #include "ObjectiveC2/runtime.h"
/* Make glibc export strdup() */ /* Make glibc export strdup() */
@ -916,7 +916,7 @@ objc_allocateMetaClass(Class superclass, size_t extraBytes)
// Initialize the metaclass // Initialize the metaclass
metaClass->class_pointer = superclass->class_pointer->class_pointer; metaClass->class_pointer = superclass->class_pointer->class_pointer;
metaClass->super_class = superclass->class_pointer; metaClass->super_class = superclass->class_pointer;
metaClass->name = "hidden class"; metaClass->name = "hidden class"; //strdup(superclass->name);
metaClass->info = _CLS_RESOLV | _CLS_INITIALIZED | _CLS_META; metaClass->info = _CLS_RESOLV | _CLS_INITIALIZED | _CLS_META;
metaClass->dtable = __objc_uninstalled_dtable; metaClass->dtable = __objc_uninstalled_dtable;
metaClass->instance_size = sizeof(struct objc_class); metaClass->instance_size = sizeof(struct objc_class);

2
Source/ObjectiveC2/runtime.h
View file

@ -1,7 +1,7 @@
#include <stdint.h> #include <stdint.h>
#include <stddef.h> #include <stddef.h>
#include <sys/types.h> #include <sys/types.h>
#include "Availability.h" #include "ObjectiveC2/Availability.h"
#if defined(ERROR_UNSUPPORTED_RUNTIME_FUNCTIONS) #if defined(ERROR_UNSUPPORTED_RUNTIME_FUNCTIONS)
# define OBJC_GNU_RUNTIME_UNSUPPORTED(x) \ # define OBJC_GNU_RUNTIME_UNSUPPORTED(x) \

2
Source/ObjectiveC2/sync.m
View file

@ -1,4 +1,4 @@
#include "runtime.h" #include "ObjectiveC2/runtime.h"
/* Ensure Unix98 compatible pthreads for glibc */ /* Ensure Unix98 compatible pthreads for glibc */
#if defined __GLIBC__ #if defined __GLIBC__