[Bf-committers] OS X Okay

Charles Wardlaw bf-committers@blender.org
Wed, 14 May 2003 14:02:48 -0700 (PDT)


Hi,

This is a CVS problem.  Sometimes, if you've edited a file and then do
a cvs update, it won't know what to do and you end up with sections
like this:

<<<<<<<<< 1.5

variable = something;

<<<<<<<<<< 1.6

variable = something_else;

>>>>>>>>>>>

You may need to delete the file and / or grab a copy from the CVS
browser on the website.

- Charles


--- Douglas Bischoff <bischofftep@mac.com> wrote:
> On Wednesday, May 14, 2003, at 00:01 US/Eastern, Willian Padovani 
> Germano wrote:
> 
> > Can you send us the compilation error msg?  I can't debug that
> myself,
> > no access to OS X, but others can and at least I need to know if
> the
> > problem is with the #ifndef's parts or something else.
> 
> Surely. Here's the output from make:
> 
> ----
> gcc -DHAVE_CONFIG_H -I. 
> -I../../../../../blender/source/blender/python/api2_2x -I../../../.. 
> -I/Library/Frameworks/Python.framework/Versions/2.2/include/python2.2
> 
> -I../../../../../blender/source/blender/blenkernel 
> -I../../../../../blender/source/blender/blenlib 
> -I../../../../../blender/source/blender/makesdna 
> -I../../../../../blender/intern/guardedalloc 
> -I../../../../../blender/intern/bmfont/ 
> -I../../../../../blender/source/blender/include -D_THREAD_SAFE 
> -I/sw/include -I/sw/include -DWITH_QUICKTIME -Wall -O3
> -funsigned-char 
> -c ../../../../../blender/source/blender/python/api2_2x/BGL.c 
> -Wp,-MD,.deps/libblender_api2_2x_la-BGL.TPlo  -fno-common -DPIC -o 
> .libs/libblender_api2_2x_la-BGL.lo
> ../../../../../blender/source/blender/python/api2_2x/BGL.h:154:
> illegal 
> external declaration, found `<<'
> ../../../../../blender/source/blender/python/api2_2x/BGL.c:340:
> illegal 
> external declaration, found `<<'
> ../../../../../blender/source/blender/python/api2_2x/BGL.c:673:
> illegal 
> external declaration, found `<<'
> ../../../../../blender/source/blender/python/api2_2x/BGL.c:688:
> illegal 
> expression, found `<<'
> ../../../../../blender/source/blender/python/api2_2x/BGL.c:688:
> illegal 
> expression, found `<<'
> ../../../../../blender/source/blender/python/api2_2x/BGL.c:688:
> illegal 
> expression, found `<<'
> ../../../../../blender/source/blender/python/api2_2x/BGL.c:688:
> illegal 
> expression, found `<'
> ../../../../../blender/source/blender/python/api2_2x/BGL.c:690:
> syntax 
> error, found `{'
> ../../../../../blender/source/blender/python/api2_2x/BGL.c:690:
> illegal 
> external declaration, missing `;' after `0x0001'
> cpp-precomp: warning: errors during smart preprocessing, retrying in 
> basic mode
> In file included from 
> ../../../../../blender/source/blender/python/api2_2x/BGL.c:37:
> ../../../../../blender/source/blender/python/api2_2x/BGL.h:154: parse
> 
> error before '<<' token
> ../../../../../blender/source/blender/python/api2_2x/BGL.c:340: parse
> 
> error before '<<' token
> ../../../../../blender/source/blender/python/api2_2x/BGL.c:348: parse
> 
> error before "if"
> ../../../../../blender/source/blender/python/api2_2x/BGL.c:348: 
> warning: type defaults to `int' in declaration of `glAccum'
> ../../../../../blender/source/blender/python/api2_2x/BGL.c:348: 
> warning: parameter names (without types) in function declaration
> ../../../../../blender/source/blender/python/api2_2x/BGL.c:348: 
> conflicting types for `glAccum'
> /System/Library/Frameworks/OpenGL.framework/Headers/gl.h:1623:
> previous 
> declaration of `glAccum'
> ../../../../../blender/source/blender/python/api2_2x/BGL.c:348: 
> warning: data definition has no type or storage class
> ../../../../../blender/source/blender/python/api2_2x/BGL.c:348: parse
> 
> error before "return"
> ../../../../../blender/source/blender/python/api2_2x/BGL.c:673: parse
> 
> error before '<<' token
> ../../../../../blender/source/blender/python/api2_2x/BGL.c: In
> function 
> `M_BGL_Init':
> ../../../../../blender/source/blender/python/api2_2x/BGL.c:1021: 
> `BGL_methods' undeclared (first use in this function)
> ../../../../../blender/source/blender/python/api2_2x/BGL.c:1021:
> (Each 
> undeclared identifier is reported only once
> ../../../../../blender/source/blender/python/api2_2x/BGL.c:1021: for 
> each function it appears in.)
> ../../../../../blender/source/blender/python/api2_2x/BGL.c: At top 
> level:
> ../../../../../blender/source/blender/python/api2_2x/BGL.h:96:
> warning: 
> `Method_Buffer_doc' defined but not used
> make[5]: *** [libblender_api2_2x_la-BGL.lo] Error 1
> ----
> 
> Hope this helps!
> 
> -Bischofftep
> 
> _______________________________________________
> Bf-committers mailing list
> Bf-committers@blender.org
> http://www.blender.org/mailman/listinfo/bf-committers