[cairo-commit] libglc/src glc.h,1.5,1.6 glcint.h,1.9,1.10

[David Reveman]

Committed by: davidr

Update of /cvs/cairo/libglc/src
In directory pdx:/tmp/cvs-serv24569/src

Modified Files:
	glc.h glcint.h 
Log Message:
Directly fold in slim stuff rather than depending on it from an external package

Index: glc.h
===================================================================
RCS file: /cvs/cairo/libglc/src/glc.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** glc.h	9 Dec 2003 10:35:57 -0000	1.5
--- glc.h	13 Dec 2003 02:28:44 -0000	1.6
***************
*** 44,53 ****
  #include <GL/gl.h>
  
- #ifdef _GLCINT_H_
- #  include <slim_export.h>
- #else
- #  include <slim_import.h>
- #endif
- 
  /* NOTE: Must be manually synchronized with LIBGLC_VERSION in configure.in */
  #define GLC_MAJOR 0
--- 44,47 ----
***************
*** 59,62 ****
--- 53,66 ----
  #endif
  
+ #if defined(WIN32) || defined(__CYGWIN__)
+ # if defined(_GLCINT_H_)
+ #  define __external_linkage	__declspec(dllexport)
+ # else
+ #  define __external_linkage	__declspec(dllimport)
+ # endif
+ #else
+ # define __external_linkage
+ #endif
+ 
  typedef int glc_bool_t;
  typedef int glc_fixed16_16_t;

Index: glcint.h
===================================================================
RCS file: /cvs/cairo/libglc/src/glcint.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** glcint.h	9 Dec 2003 19:50:45 -0000	1.9
--- glcint.h	13 Dec 2003 02:28:44 -0000	1.10
***************
*** 29,39 ****
  #define GLCINT_H_INCLUDED
  
- #include "glc.h"
- 
  #include <stdlib.h>
  #include <string.h>
  #include <limits.h>
  
! #include <slim_internal.h>
  
  #define GLC_STATUS_NO_MEMORY_MASK          (1L << 0)
--- 29,67 ----
  #define GLCINT_H_INCLUDED
  
  #include <stdlib.h>
  #include <string.h>
  #include <limits.h>
  
! #include "glc.h"
! 
! #if __GNUC__ >= 3 && defined(__ELF__)
! # define slim_hidden_proto(name)	slim_hidden_proto1(name, INT_##name)
! # define slim_hidden_def(name)		slim_hidden_def1(name, INT_##name)
! # define slim_hidden_proto1(name, internal)				\
!   extern __typeof (name) name						\
! 	__asm__ (slim_hidden_asmname (internal))			\
! 	__internal_linkage;
! # define slim_hidden_def1(name, internal)				\
!   extern __typeof (name) EXT_##name __asm__(slim_hidden_asmname(name))	\
! 	__attribute__((__alias__(slim_hidden_asmname(internal))))
! # define slim_hidden_ulp		slim_hidden_ulp1(__USER_LABEL_PREFIX__)
! # define slim_hidden_ulp1(x)		slim_hidden_ulp2(x)
! # define slim_hidden_ulp2(x)		#x
! # define slim_hidden_asmname(name)	slim_hidden_asmname1(name)
! # define slim_hidden_asmname1(name)	slim_hidden_ulp #name
! #else
! # define slim_hidden_proto(name)
! # define slim_hidden_def(name)
! #endif
! 
! #if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3)) && defined(__ELF__)
! #define __internal_linkage	__attribute__((__visibility__("hidden")))
! #else
! #define __internal_linkage
! #endif
! 
! #ifndef __GNUC__
! #define __attribute__(x)
! #endif
  
  #define GLC_STATUS_NO_MEMORY_MASK          (1L << 0)