3D Canvas

Check-in [5395703856]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Fix some macro redefinition warnings
Timelines: family | ancestors | descendants | both | vc-reform
Files: files | file ages | folders
SHA1: 5395703856678245afac82bedb55bbc28e0b95f9
User & Date: apnadkarni 2017-11-19 06:34:45
Context
2017-11-19
09:15
Fix TK version checks Closed-Leaf check-in: 0181d18fc5 user: apnadkarni tags: vc-reform
06:34
Fix some macro redefinition warnings check-in: 5395703856 user: apnadkarni tags: vc-reform
06:34
Updated nmake build files to modernized versions. check-in: 6b993a10a9 user: apnadkarni tags: vc-reform
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to generic/c3d.h.

12
13
14
15
16
17
18

19


20

21
22
23
24
25
26
27

#include <tcl.h>
#include <tk.h>
#include <string.h>
#include <stdio.h>

#if (TK_MAJOR_VERSION >= 8 && TK_MINOR_VERSION >= 6)

  #define UNICODE


  #define _UNICODE

#endif

#ifdef MAC_OSX_TK
# include <OpenGL/gl.h>
# if (TK_MAJOR_VERSION >= 8 && TK_MINOR_VERSION >= 5)
#  define CAN3D_NSOPENGL
#  include <OpenGL/OpenGL.h>







>
|
>
>
|
>







12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31

#include <tcl.h>
#include <tk.h>
#include <string.h>
#include <stdio.h>

#if (TK_MAJOR_VERSION >= 8 && TK_MINOR_VERSION >= 6)
# ifndef UNICODE
#  define UNICODE
# endif
# ifndef _UNICODE
#  define _UNICODE
# endif
#endif

#ifdef MAC_OSX_TK
# include <OpenGL/gl.h>
# if (TK_MAJOR_VERSION >= 8 && TK_MINOR_VERSION >= 5)
#  define CAN3D_NSOPENGL
#  include <OpenGL/OpenGL.h>

Changes to generic/c3dsearch.c.

7
8
9
10
11
12
13

14

15
16
17
18
19
20
21

#include "c3d.h"
#include <assert.h>
#include <stdlib.h>
#include <string.h>
#include <ctype.h>
#ifdef CAN3D_WGL

#define strncasecmp  strnicmp

#endif

typedef struct C3dExpr C3dExpr;

/*
 * This macro checks a few invariants that should hold true for all C3dTag
 * structures.







>
|
>







7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23

#include "c3d.h"
#include <assert.h>
#include <stdlib.h>
#include <string.h>
#include <ctype.h>
#ifdef CAN3D_WGL
#ifndef strncasecmp
# define strncasecmp  strnicmp
#endif
#endif

typedef struct C3dExpr C3dExpr;

/*
 * This macro checks a few invariants that should hold true for all C3dTag
 * structures.