Author: stefanbidi
Date: Fri Sep 19 17:36:39 2014
New Revision: 38087
URL: http://svn.gna.org/viewcvs/gnustep?rev=38087&view=rev
Log:
* Source/CFSocket.c: Fix build without libdispatch.
* Headers/CoreFoundation/CFBase.h.in,
configure,
configure.ac: Use correct sign for data types.
Modified:
libs/corebase/trunk/ChangeLog
libs/corebase/trunk/Headers/CoreFoundation/CFBase.h.in
libs/corebase/trunk/Source/CFSocket.c
libs/corebase/trunk/configure
libs/corebase/trunk/configure.ac
Modified: libs/corebase/trunk/ChangeLog
URL:
http://svn.gna.org/viewcvs/gnustep/libs/corebase/trunk/ChangeLog?rev=38087&r1=38086&r2=38087&view=diff
==============================================================================
--- libs/corebase/trunk/ChangeLog (original)
+++ libs/corebase/trunk/ChangeLog Fri Sep 19 17:36:39 2014
@@ -1,3 +1,9 @@
+2014-09-19 Stefan Bidigaray <[email protected]>
+ * Source/CFSocket.c: Fix build without libdispatch.
+ * Headers/CoreFoundation/CFBase.h.in,
+ configure,
+ configure.ac: Use correct sign for data types.
+
2014-05-06 Lubos Dolezel <[email protected]>
* Source/CFRunLoop.c,
Headers/CoreFoundation/CFRunLoop.h: CFRunLoop improvements & fixes
Modified: libs/corebase/trunk/Headers/CoreFoundation/CFBase.h.in
URL:
http://svn.gna.org/viewcvs/gnustep/libs/corebase/trunk/Headers/CoreFoundation/CFBase.h.in?rev=38087&r1=38086&r2=38087&view=diff
==============================================================================
--- libs/corebase/trunk/Headers/CoreFoundation/CFBase.h.in (original)
+++ libs/corebase/trunk/Headers/CoreFoundation/CFBase.h.in Fri Sep 19
17:36:39 2014
@@ -54,13 +54,13 @@
*/
typedef @GS_UINT8_T@ Boolean;
typedef @GS_UINT8_T@ UInt8;
-typedef @GS_INT8_T@ SInt8;
+typedef @GS_SINT8_T@ SInt8;
typedef @GS_UINT16_T@ UInt16;
-typedef @GS_INT16_T@ SInt16;
+typedef @GS_SINT16_T@ SInt16;
typedef @GS_UINT32_T@ UInt32;
-typedef @GS_INT32_T@ SInt32;
+typedef @GS_SINT32_T@ SInt32;
typedef @GS_UINT64_T@ UInt64;
-typedef @GS_INT64_T@ SInt64;
+typedef @GS_SINT64_T@ SInt64;
typedef SInt32 OSStatus;
typedef float Float32;
@@ -171,7 +171,7 @@
* Base Utilities
*/
typedef @GS_UINTPTR_T@ CFOptionFlags;
-typedef @GS_INTPTR_T@ CFIndex;
+typedef @GS_SINTPTR_T@ CFIndex;
typedef struct {
CFIndex location;
Modified: libs/corebase/trunk/Source/CFSocket.c
URL:
http://svn.gna.org/viewcvs/gnustep/libs/corebase/trunk/Source/CFSocket.c?rev=38087&r1=38086&r2=38087&view=diff
==============================================================================
--- libs/corebase/trunk/Source/CFSocket.c (original)
+++ libs/corebase/trunk/Source/CFSocket.c Fri Sep 19 17:36:39 2014
@@ -83,6 +83,7 @@
CFDataRef _peerAddress;
Boolean _isConnected;
Boolean _isListening;
+ CFRunLoopSourceRef _source;
#if HAVE_LIBDISPATCH
dispatch_source_t _readSource;
Boolean _readFired;
@@ -90,7 +91,6 @@
dispatch_source_t _writeSource;
Boolean _writeFired;
Boolean _writeResumed;
- CFRunLoopSourceRef _source;
#endif
};
Modified: libs/corebase/trunk/configure
URL:
http://svn.gna.org/viewcvs/gnustep/libs/corebase/trunk/configure?rev=38087&r1=38086&r2=38087&view=diff
==============================================================================
--- libs/corebase/trunk/configure (original)
+++ libs/corebase/trunk/configure Fri Sep 19 17:36:39 2014
@@ -628,15 +628,15 @@
GNUSTEP_CONFIG
ICU_CONFIG
GS_UINTPTR_T
-GS_INTPTR_T
+GS_SINTPTR_T
GS_UINT32_T
-GS_INT32_T
+GS_SINT32_T
GS_UINT64_T
-GS_INT64_T
+GS_SINT64_T
GS_UINT16_T
-GS_INT16_T
+GS_SINT16_T
GS_UINT8_T
-GS_INT8_T
+GS_SINT8_T
EGREP
GREP
CPP
@@ -3963,61 +3963,61 @@
_ACEOF
-GS_INT8_T="char"
+GS_SINT8_T="signed char"
GS_UINT8_T="unsigned char"
-GS_INT16_T="short"
+GS_SINT16_T="signed short"
GS_UINT16_T="unsigned short"
-GS_INT64_T="long long"
+GS_SINT64_T="signed long long"
GS_UINT64_T="unsigned long long"
case $gs_cv_c_data_model in #(
IP16) :
- GS_INT32_T="long"
+ GS_SINT32_T="signed long"
GS_UINT32_T="unsigned long"
- GS_INTPTR_T="int"
+ GS_SINTPTR_T="signed int"
GS_UINTPTR_T="unsigned int"
;; #(
LP32) :
- GS_INT32_T="long"
+ GS_SINT32_T="signed long"
GS_UINT32_T="unsigned long"
- GS_INTPTR_T="long"
+ GS_SINTPTR_T="signed long"
GS_UINTPTR_T="unsigned long"
;; #(
ILP32) :
- GS_INT32_T="int"
+ GS_SINT32_T="signed int"
GS_UINT32_T="unsigned int"
- GS_INTPTR_T="int"
+ GS_SINTPTR_T="signed int"
GS_UINTPTR_T="unsigned int"
;; #(
LLP64) :
- GS_INT32_T="int"
+ GS_SINT32_T="signed int"
GS_UINT32_T="unsigned int"
- GS_INTPTR_T="long long"
+ GS_SINTPTR_T="signed long long"
GS_UINTPTR_T="unsigned long long"
;; #(
LP64) :
- GS_INT32_T="int"
+ GS_SINT32_T="signed int"
GS_UINT32_T="unsigned int"
- GS_INTPTR_T="long"
+ GS_SINTPTR_T="signed long"
GS_UINTPTR_T="unsigned long"
;; #(
@@ -4230,7 +4230,7 @@
fi
if test "$ac_cv_lib_dispatch_dispatch_get_main_queue_eventfd_np" =
"no"; then :
- as_fn_error $? "Compatible libdispatch not found for GCD support! Use
--disable-gcd to disable GCD support or install GCD." "$LINENO" 5
+ as_fn_error $? "Compatible libdispatch not found for GCD support! Use
--disable-gcd to disable GCD support." "$LINENO" 5
fi
fi
Modified: libs/corebase/trunk/configure.ac
URL:
http://svn.gna.org/viewcvs/gnustep/libs/corebase/trunk/configure.ac?rev=38087&r1=38086&r2=38087&view=diff
==============================================================================
--- libs/corebase/trunk/configure.ac (original)
+++ libs/corebase/trunk/configure.ac Fri Sep 19 17:36:39 2014
@@ -42,32 +42,32 @@
AC_DEFINE_UNQUOTED([DATA_MODEL], [DATA_MODEL_$gs_cv_c_data_model], [Define to
the architecture's data model.])
]) # GS_CHECK_DATA_MODEL
GS_CHECK_DATA_MODEL
-AC_SUBST([GS_INT8_T], ["char"])
+AC_SUBST([GS_SINT8_T], ["signed char"])
AC_SUBST([GS_UINT8_T], ["unsigned char"])
-AC_SUBST([GS_INT16_T], ["short"])
+AC_SUBST([GS_SINT16_T], ["signed short"])
AC_SUBST([GS_UINT16_T], ["unsigned short"])
-AC_SUBST([GS_INT64_T], ["long long"])
+AC_SUBST([GS_SINT64_T], ["signed long long"])
AC_SUBST([GS_UINT64_T], ["unsigned long long"])
AS_CASE([$gs_cv_c_data_model],
- [IP16], [AC_SUBST([GS_INT32_T], ["long"])
+ [IP16], [AC_SUBST([GS_SINT32_T], ["signed long"])
AC_SUBST([GS_UINT32_T], ["unsigned long"])
- AC_SUBST([GS_INTPTR_T], ["int"])
+ AC_SUBST([GS_SINTPTR_T], ["signed int"])
AC_SUBST([GS_UINTPTR_T], ["unsigned int"])],
- [LP32], [AC_SUBST([GS_INT32_T], ["long"])
+ [LP32], [AC_SUBST([GS_SINT32_T], ["signed long"])
AC_SUBST([GS_UINT32_T], ["unsigned long"])
- AC_SUBST([GS_INTPTR_T], ["long"])
+ AC_SUBST([GS_SINTPTR_T], ["signed long"])
AC_SUBST([GS_UINTPTR_T], ["unsigned long"])],
- [ILP32], [AC_SUBST([GS_INT32_T], ["int"])
+ [ILP32], [AC_SUBST([GS_SINT32_T], ["signed int"])
AC_SUBST([GS_UINT32_T], ["unsigned int"])
- AC_SUBST([GS_INTPTR_T], ["int"])
+ AC_SUBST([GS_SINTPTR_T], ["signed int"])
AC_SUBST([GS_UINTPTR_T], ["unsigned int"])],
- [LLP64], [AC_SUBST([GS_INT32_T], ["int"])
+ [LLP64], [AC_SUBST([GS_SINT32_T], ["signed int"])
AC_SUBST([GS_UINT32_T], ["unsigned int"])
- AC_SUBST([GS_INTPTR_T], ["long long"])
+ AC_SUBST([GS_SINTPTR_T], ["signed long long"])
AC_SUBST([GS_UINTPTR_T], ["unsigned long long"])],
- [LP64], [AC_SUBST([GS_INT32_T], ["int"])
+ [LP64], [AC_SUBST([GS_SINT32_T], ["signed int"])
AC_SUBST([GS_UINT32_T], ["unsigned int"])
- AC_SUBST([GS_INTPTR_T], ["long"])
+ AC_SUBST([GS_SINTPTR_T], ["signed long"])
AC_SUBST([GS_UINTPTR_T], ["unsigned long"])],
[AC_MSG_ERROR([Could not identify the architecture's data model.])])
@@ -117,7 +117,7 @@
])
AC_CHECK_LIB(dispatch, dispatch_get_main_queue_eventfd_np)
AS_IF([test
"$ac_cv_lib_dispatch_dispatch_get_main_queue_eventfd_np" = "no"],
- [AC_MSG_ERROR([Compatible libdispatch not found for GCD
support! Use --disable-gcd to disable GCD support or install GCD.])])])
+ [AC_MSG_ERROR([Compatible libdispatch not found for GCD
support! Use --disable-gcd to disable GCD support.])])])
#---
# Check for the Objective-C runtime
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
